From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <guix-patches-bounces+larch=yhetil.org@gnu.org>
Received: from mp12.migadu.com ([2001:41d0:2:bcc0::])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits))
	by ms9.migadu.com with LMTPS
	id GEjIIhRBSGSg9AAASxT56A
	(envelope-from <guix-patches-bounces+larch=yhetil.org@gnu.org>)
	for <larch@yhetil.org>; Tue, 25 Apr 2023 23:07:32 +0200
Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits))
	by mp12.migadu.com with LMTPS
	id iHObIhRBSGR0UAAAauVa8A
	(envelope-from <guix-patches-bounces+larch=yhetil.org@gnu.org>)
	for <larch@yhetil.org>; Tue, 25 Apr 2023 23:07:32 +0200
Received: from lists.gnu.org (lists.gnu.org [209.51.188.17])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by aspmx1.migadu.com (Postfix) with ESMTPS id 01C2C11EAD
	for <larch@yhetil.org>; Tue, 25 Apr 2023 23:07:32 +0200 (CEST)
Received: from localhost ([::1] helo=lists1p.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.90_1)
	(envelope-from <guix-patches-bounces@gnu.org>)
	id 1prPSG-0000Xv-Lv; Tue, 25 Apr 2023 16:40:04 -0400
Received: from eggs.gnu.org ([2001:470:142:3::10])
 by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <Debian-debbugs@debbugs.gnu.org>)
 id 1prPSE-0000TC-PU
 for guix-patches@gnu.org; Tue, 25 Apr 2023 16:40:02 -0400
Received: from debbugs.gnu.org ([209.51.188.43])
 by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
 (Exim 4.90_1) (envelope-from <Debian-debbugs@debbugs.gnu.org>)
 id 1prPSE-0003aH-Er
 for guix-patches@gnu.org; Tue, 25 Apr 2023 16:40:02 -0400
Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2)
 (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1prPSD-0002Vu-Rn
 for guix-patches@gnu.org; Tue, 25 Apr 2023 16:40:01 -0400
X-Loop: help-debbugs@gnu.org
Subject: [bug#63075] [PATCH 2/2] gnu: supercollider: Apply guix style.
References: <20230425203323.j5emxz2ebvhs4ckt@blackbox>
In-Reply-To: <20230425203323.j5emxz2ebvhs4ckt@blackbox>
Resent-From: Gabriel Wicki <gabriel@erlikon.ch>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org>
Resent-CC: guix-patches@gnu.org
Resent-Date: Tue, 25 Apr 2023 20:40:01 +0000
Resent-Message-ID: <handler.63075.B63075.16824551749620@debbugs.gnu.org>
Resent-Sender: help-debbugs@gnu.org
X-GNU-PR-Message: followup 63075
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 63075@debbugs.gnu.org
Received: via spool by 63075-submit@debbugs.gnu.org id=B63075.16824551749620
 (code B ref 63075); Tue, 25 Apr 2023 20:40:01 +0000
Received: (at 63075) by debbugs.gnu.org; 25 Apr 2023 20:39:34 +0000
Received: from localhost ([127.0.0.1]:53676 helo=debbugs.gnu.org)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <debbugs-submit-bounces@debbugs.gnu.org>)
 id 1prPRl-0002V6-Bz
 for submit@debbugs.gnu.org; Tue, 25 Apr 2023 16:39:33 -0400
Received: from chimborazo.ee.ethz.ch ([129.132.2.15]:35659)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <gabriel@erlikon.ch>) id 1prPRj-0002Un-FN
 for 63075@debbugs.gnu.org; Tue, 25 Apr 2023 16:39:32 -0400
Received: from blackbox (212-51-128-25.fiber7.init7.net [212.51.128.25])
 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
 key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest
 SHA256) (Client did not present a certificate)
 (Authenticated sender: gabriel)
 by chimborazo.ee.ethz.ch (Postfix) with ESMTPSA id 964C540093
 for <63075@debbugs.gnu.org>; Tue, 25 Apr 2023 22:39:24 +0200 (CEST)
Date: Tue, 25 Apr 2023 22:39:21 +0200
From: Gabriel Wicki <gabriel@erlikon.ch>
Message-ID: <20230425203921.lm32yffgshuakjm6@blackbox>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
X-BeenThere: debbugs-submit@debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
X-BeenThere: guix-patches@gnu.org
List-Id: <guix-patches.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/guix-patches>,
 <mailto:guix-patches-request@gnu.org?subject=unsubscribe>
List-Archive: <https://lists.gnu.org/archive/html/guix-patches>
List-Post: <mailto:guix-patches@gnu.org>
List-Help: <mailto:guix-patches-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/guix-patches>,
 <mailto:guix-patches-request@gnu.org?subject=subscribe>
Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org
Sender: guix-patches-bounces+larch=yhetil.org@gnu.org
X-Migadu-Flow: FLOW_IN
X-Migadu-Country: US
ARC-Seal: i=1; s=key1; d=yhetil.org; t=1682456852; a=rsa-sha256; cv=none;
	b=Ph7h8Jw+WW6bUNlH9BQMeIp0w1soSVwjW1ps8dk3SyUN7h04lF6UOWbXjoc0TiwYy1XtqI
	bHL/Zio7nlAe5Y0rEGtGYcdzLOiGJToYzmwdSzMYNF4sLz3mkpOk+Vr8SIf7G51gorPv4A
	minT+9fg6WEVmJdlTeAdYPrb7uAio/WOqseIv6AB4y/79n0V/VT42DhYkdUgzPQ+880qoD
	WU21jm9a4q0CtUW4aAjfA3Z0gupmDc7QDOC0brSBHgGfYHxDipqW9qm7YGLxJQTcfwZEg8
	OPuQqRddd9vb5nU2TA2Pw/YGj3gtFNwtC8S/nrpRntCTHRvA2u8qGzv9WoclPw==
ARC-Authentication-Results: i=1;
	aspmx1.migadu.com;
	dkim=none;
	dmarc=none;
	spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org;
	s=key1; t=1682456852;
	h=from:from:sender:sender:reply-to:subject:subject:date:date:
	 message-id:message-id:to:to:cc:mime-version:mime-version:
	 content-type:content-type:resent-cc:resent-from:resent-sender:
	 resent-message-id:in-reply-to:in-reply-to:references:references:
	 list-id:list-help:list-unsubscribe:list-subscribe:list-post;
	bh=dED/ibIYV/rMp8s4Z4OREbwQ0SkoKDR7dPggwfm1mAI=;
	b=jOdofbLnh/T+1Nbe3HZNKSYtgeIM6e8E8asJ6YgaYYkqEUD9dr9qJd/AaG7/KSIm4zeMx1
	bixFs1ODhkvzMGUAsH8zUwFaWsSbiJF7rZURHZSKc9TFByWunJXDKgJ3DbVcBaOUN2Bjb7
	wbJ+cf1rv/zIgd2U8xO7PTJlpV1/RtFOpxAm7X8O1ne1M8hBucG4nwqjFt54hrH6EVYc6Q
	Q0VaRvdlrPLWi6F31aGe0cjNPsVykQv4gxUmn/klF/EWeZfVy+aIpiOsID1ReDEsN0zUBn
	gz5/ha8KlfYqWngvDLPlEwQTsXWTqBmXMbqmMizfNmrgJterW7ei1GJRvHdDWg==
X-Migadu-Scanner: scn1.migadu.com
Authentication-Results: aspmx1.migadu.com;
	dkim=none;
	dmarc=none;
	spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"
X-Migadu-Spam-Score: -2.71
X-Spam-Score: -2.71
X-Migadu-Queue-Id: 01C2C11EAD
X-TUID: KBr75yEHIvcG

>From 5091d29a2765e550985c058657deb5771a24a1a1 Mon Sep 17 00:00:00 2001
Message-Id: <5091d29a2765e550985c058657deb5771a24a1a1.1682453413.git.gabriel@erlikon.ch>
In-Reply-To: <f67786eb958a65ba778f67a8f443fa3d24293438.1682453413.git.gabriel@erlikon.ch>
References: <f67786eb958a65ba778f67a8f443fa3d24293438.1682453413.git.gabriel@erlikon.ch>
From: Gabriel Wicki <gabriel@erlikon.ch>
Date: Tue, 25 Apr 2023 22:06:18 +0200
Subject: [PATCH 2/2] gnu: supercollider: Apply 'guix style'.

* gnu/packages/audio.scm: Apply guix style.
---
 gnu/packages/audio.scm | 173 +++++++++++++++++++++--------------------
 1 file changed, 87 insertions(+), 86 deletions(-)

diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm
index 109133ba8e..f07b7a6069 100644
--- a/gnu/packages/audio.scm
+++ b/gnu/packages/audio.scm
@@ -3444,114 +3444,115 @@ (define-public supercollider
   (package
     (name "supercollider")
     (version "3.12.1")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://github.com/supercollider/supercollider")
-             (commit (string-append "Version-" version))
-             ;; for nova-simd, nova-tt, hidapi, TLSF, oscpack
-             (recursive? #t)))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32
-         "0id522338a464j1slcspajwc7klypbc9qpigw5mqjhrw970wij5z"))
-       (modules '((guix build utils)
-                  (ice-9 ftw)))
-       (snippet
-        ;; The build system doesn't allow us to unbundle the following
-        ;; libraries.  hidapi is also heavily patched and upstream not
-        ;; actively maintained.
-        '(let ((keep-dirs '("nova-simd" "nova-tt" "hidapi"
-                            "TLSF-2.4.6" "oscpack_1_1_0" "." "..")))
-           (with-directory-excursion "./external_libraries"
-             (for-each
-              delete-file-recursively
-              (scandir "."
-                       (lambda (x)
-                         (and (eq? (stat:type (stat x)) 'directory)
-                              (not (member (basename x) keep-dirs)))))))
-           ;; To find the Guix provided ableton-link library.
-           (substitute* "lang/CMakeLists.txt"
-             (("include\\(\\.\\./external_libraries/link/\
-AbletonLinkConfig\\.cmake\\)")
-              "find_package(AbletonLink NAMES AbletonLink ableton-link \
-link REQUIRED)"))))))
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/supercollider/supercollider")
+                    (commit (string-append "Version-" version))
+                    ;; for nova-simd, nova-tt, hidapi, TLSF, oscpack
+                    (recursive? #t)))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "0id522338a464j1slcspajwc7klypbc9qpigw5mqjhrw970wij5z"))
+              (modules '((guix build utils)
+                         (ice-9 ftw)))
+              (snippet
+               ;; The build system doesn't allow us to unbundle the following
+               ;; libraries.  hidapi is also heavily patched and upstream not
+               ;; actively maintained.
+               '(let ((keep-dirs '("nova-simd" "nova-tt"
+                                   "hidapi"
+                                   "TLSF-2.4.6"
+                                   "oscpack_1_1_0"
+                                   "."
+                                   "..")))
+                  (with-directory-excursion "./external_libraries"
+                    (for-each delete-file-recursively
+                              (scandir "."
+                                       (lambda (x)
+                                         (and (eq? (stat:type (stat x))
+                                                   'directory)
+                                              (not (member (basename x)
+                                                           keep-dirs)))))))
+                  ;; To find the Guix provided ableton-link library.
+                  (substitute* "lang/CMakeLists.txt"
+                    (("include\\(\\.\\./external_libraries/link/AbletonLinkConfig\\.cmake\\)")
+                     "find_package(AbletonLink NAMES AbletonLink ableton-link link REQUIRED)"))))))
     (build-system cmake-build-system)
-    (outputs
-     '("out"                            ;core language
-       "ide"))                          ;qt ide
+    (outputs '("out" ;core language
+               "ide")) ;qt ide
     (arguments
-     `(#:configure-flags '("-DSYSTEM_BOOST=ON"
-                           "-DSYSTEM_YAMLCPP=ON"
+     `(#:configure-flags '("-DSYSTEM_BOOST=ON" "-DSYSTEM_YAMLCPP=ON"
                            "-DSC_QT=ON"
                            "-DCMAKE_BUILD_TYPE=Release"
                            "-DFORTIFY=ON"
                            "-DLIBSCSYNTH=ON"
                            "-DSC_EL=OFF") ;scel is packaged individually as emacs-scel
-       #:phases
-       (modify-phases %standard-phases
-         ;; HOME must be defined otherwise supercollider throws a "ERROR:
-         ;; Primitive '_FileMkDir' failed." error when generating the doc.
-         ;; The graphical tests also hang without it.
-         (add-after 'unpack 'set-home-directory
-           (lambda _
-             (setenv "HOME" (getcwd))))
-         (add-after 'unpack 'patch-scclass-dir
-           (lambda* (#:key outputs #:allow-other-keys)
-             (let* ((out (assoc-ref outputs "out"))
-                    (scclass-dir
-                     (string-append out
-                                    "/share/SuperCollider/SCClassLibrary")))
-               (substitute* "lang/LangSource/SC_LanguageConfig.cpp"
-                 (((string-append
-                    "SC_Filesystem::instance\\(\\)\\.getDirectory"
-                    "\\(DirName::Resource\\) / CLASS_LIB_DIR_NAME"))
-                  (string-append "Path(\"" scclass-dir "\")"))))))
-         (add-after 'patch-scclass-dir 'fix-struct-SOUNDFILE-tag
-           (lambda* _
-             (display (getcwd)) (newline)
-             (substitute* "include/plugin_interface/SC_SndBuf.h"
-               (("SNDFILE_tag")
-                "sf_private_tag"))))
-         (add-before 'build 'prepare-x
-           (lambda _
-             (system "Xvfb &")
-             (setenv "DISPLAY" ":0")))
-         (add-before 'install 'install-ide
-           (lambda* (#:key outputs #:allow-other-keys)
-             (let* ((out (assoc-ref outputs "out"))
-                    (ide (assoc-ref outputs "ide"))
-                    (scide "editors/sc-ide/scide"))
-               (install-file scide
-                             (string-append ide "/bin"))
-               (delete-file scide)))))))
-    (native-inputs
-     (list ableton-link pkg-config qttools-5 xorg-server-for-tests))
+       #:phases (modify-phases %standard-phases
+                  ;; HOME must be defined otherwise supercollider throws a "ERROR:
+                  ;; Primitive '_FileMkDir' failed." error when generating the doc.
+                  ;; The graphical tests also hang without it.
+                  (add-after 'unpack 'set-home-directory
+                    (lambda _
+                      (setenv "HOME"
+                              (getcwd))))
+                  (add-after 'unpack 'patch-scclass-dir
+                    (lambda* (#:key outputs #:allow-other-keys)
+                      (let* ((out (assoc-ref outputs "out"))
+                             (scclass-dir (string-append out
+                                           "/share/SuperCollider/SCClassLibrary")))
+                        (substitute* "lang/LangSource/SC_LanguageConfig.cpp"
+                          (((string-append
+                             "SC_Filesystem::instance\\(\\)\\.getDirectory"
+                             "\\(DirName::Resource\\) / CLASS_LIB_DIR_NAME"))
+                           (string-append "Path(\"" scclass-dir "\")"))))))
+                  (add-after 'patch-scclass-dir 'fix-struct-SOUNDFILE-tag
+                    (lambda* _
+                      (display (getcwd))
+                      (newline)
+                      (substitute* "include/plugin_interface/SC_SndBuf.h"
+                        (("SNDFILE_tag")
+                         "sf_private_tag"))))
+                  (add-before 'build 'prepare-x
+                    (lambda _
+                      (system "Xvfb &")
+                      (setenv "DISPLAY" ":0")))
+                  (add-before 'install 'install-ide
+                    (lambda* (#:key outputs #:allow-other-keys)
+                      (let* ((out (assoc-ref outputs "out"))
+                             (ide (assoc-ref outputs "ide"))
+                             (scide "editors/sc-ide/scide"))
+                        (install-file scide
+                                      (string-append ide "/bin"))
+                        (delete-file scide)))))))
+    (native-inputs (list ableton-link pkg-config qttools-5
+                         xorg-server-for-tests))
     (inputs (list jack-1
                   libsndfile
                   fftw
                   libxt
-                  readline              ;readline support for sclang's CLI
-                  alsa-lib              ;for sclang's MIDI interface
-                  eudev                 ;for user interactions with devices
-                  avahi                 ;zeroconf service discovery support
+                  readline ;readline support for sclang's CLI
+                  alsa-lib ;for sclang's MIDI interface
+                  eudev ;for user interactions with devices
+                  avahi ;zeroconf service discovery support
                   icu4c
                   boost
                   boost-sync
                   yaml-cpp
-                  python-wrapper        ;there were warnings in the build process
-                  ruby                  ;there were warnings in the build process
+                  python-wrapper ;there were warnings in the build process
+                  ruby ;there were warnings in the build process
                   qtbase-5
                   qtdeclarative-5
                   qtsvg-5
                   qtwebchannel-5
                   qtwebsockets-5))
-    (propagated-inputs                  ;to get native-search-path
-     (list qtwebengine-5))
+    (propagated-inputs ;to get native-search-path
+                       (list qtwebengine-5))
     (home-page "https://github.com/supercollider/supercollider")
     (synopsis "Synthesis engine and programming language")
-    (description "SuperCollider is a synthesis engine (@code{scsynth} or
+    (description
+     "SuperCollider is a synthesis engine (@code{scsynth} or
 @code{supernova}) and programming language (@code{sclang}).  It can be used
 for experimenting with sound synthesis and algorithmic composition.
 
-- 
2.39.2