Re: [PATCH 9/9] gnu: Add weston.

2016-09-07 Thread David Craven
> Did you test this? > Pushed. but just realized now that I should have pushed to > core-updates, since it requires patches from core-updates. Most builds > will probably fail until core-updates is merged... Sorry about that.

Re: [PATCH v2] gnu: Add mtd-utils.

2016-09-07 Thread Danny Milosavljevic
Hi Leo, On Tue, 6 Sep 2016 17:49:41 -0400 Leo Famulari wrote: > I imported the acl module, used #:make-flags to set PREFIX, and made a > minor adjustment to the description. > > What do you think? Looks good and works :)

[PATCH] gnu: Simplify dtc package definition.

2016-09-07 Thread Danny Milosavljevic
--- gnu/packages/u-boot.scm | 10 +++--- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/gnu/packages/u-boot.scm b/gnu/packages/u-boot.scm index e9a4b90..7949d8a 100644 --- a/gnu/packages/u-boot.scm +++ b/gnu/packages/u-boot.scm @@ -47,15 +47,11 @@ ("flex" ,flex))) (

Re: [PATCH] Build sandbox support etc. unconditionally on Linux.

2016-09-07 Thread Ludovic Courtès
Hello Manolis! Manolis Ragkousis skribis: > On 08/10/16 20:39, Mark H Weaver wrote: >> >> I'm very reluctant to apply this patch. In general, it's preferable to >> rely on autoconf to test for individual features, rather than testing >> for particular kernels by name. It seems to me that this

Re: [PATCH] gnu: Simplify dtc package definition.

2016-09-07 Thread David Craven
LGTM. Are these changes part of the debian patchset?

Re: [PATCH] daemon: Break CHROOT_ENABLED into smaller macros.

2016-09-07 Thread Ludovic Courtès
Hi! Manolis Ragkousis skribis: > From aea4bf23b699b7ef5d7007b81f296b77324d5b6c Mon Sep 17 00:00:00 2001 > From: Manolis Ragkousis > Date: Sun, 7 Aug 2016 17:48:30 +0300 > Subject: [PATCH] daemon: Break CHROOT_ENABLED into smaller macros. > > We need to check for CLONE_NEWNS only when we want to

Re: [PATCH] gnu: Add pybitmessage, [PATCH] gnu: Add python2-pyqt-4, [PATCH] gnu: gnu: messaging: Use license: prefix.

2016-09-07 Thread Efraim Flashner
On Thu, Aug 25, 2016 at 09:52:22AM +, ng0 wrote: > ng0 writes: > > > These 3 patches enable us to have a functional pybitmessage version > > 0.6.1, released 2 days ago. > > > > For tests you can use either the test channel which can be found on > > bitmessage.org (or in the application itself

[PATCH 1/2] gnu: man-db: Use modify-phases syntax.

2016-09-07 Thread Ricardo Wurmus
* gnu/packages/man.scm (man-db)[arguments]: Use modify-phases syntax. --- gnu/packages/man.scm | 25 - 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/gnu/packages/man.scm b/gnu/packages/man.scm index 9ffbba9..a5ee2d3 100644 --- a/gnu/packages/man.scm +++ b/

[PATCH 2/2] gnu: man-db: Patch path to iconv.

2016-09-07 Thread Ricardo Wurmus
* gnu/packages/man.scm (man-db)[arguments]: Add phase "patch-iconv-path". Fixes . --- gnu/packages/man.scm | 8 +++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/gnu/packages/man.scm b/gnu/packages/man.scm index a5ee2d3..8658519 100644 --- a/gnu/pa

Re: [PATCH v2] gnu: Add rust

2016-09-07 Thread David Craven
I haven't actually built rustc yet, because I know how long it takes... > + (ld-so (string-append > + (assoc-ref inputs "libc") > + ,(glibc-dynamic-linker))) > + ;; Remove reference to "/li

Re: [PATCH] gnu: Simplify dtc package definition.

2016-09-07 Thread Danny Milosavljevic
Hi David, On Wed, 7 Sep 2016 10:15:29 +0200 David Craven wrote: > LGTM. Are these changes part of the debian patchset? No, I found out that GNU make allows you to override variables used inside Makefiles from make's command line. To test: write a Makefile containing: #- PREFIX = /foo a

Re: [PATCH 1/2] gnu: man-db: Use modify-phases syntax.

2016-09-07 Thread Efraim Flashner
On Wed, Sep 07, 2016 at 10:47:06AM +0200, Ricardo Wurmus wrote: > * gnu/packages/man.scm (man-db)[arguments]: Use modify-phases syntax. > --- > gnu/packages/man.scm | 25 - > 1 file changed, 12 insertions(+), 13 deletions(-) > > diff --git a/gnu/packages/man.scm b/gnu/pack

Re: [PATCH] gnu: Add tcp-wrappers.

2016-09-07 Thread Ludovic Courtès
John Darrington skribis: > * gnu/packages/networking.scm (tcp-wrappers): New variable. > * gnu/packages/messaging.scm (ngircd) [inputs]: Add tcp-wrappers. Could you commit the second part separately? > + (map (lambda (x) > + (install-file x (string-append > +

Re: PYTHONPATH anomaly

2016-09-07 Thread Ludovic Courtès
Hello! Hartmut Goebel skribis: > Questions: > > 1) Is it intended that the current dir is not part of sys.path? I don’t know about the specifics of Python here, but it’s always a security problem to put “.” in a search path: users could end up arbitrary code that just happens to be in $PWD. So

Re: ghc 8

2016-09-07 Thread Ludovic Courtès
ng0 skribis: > Ludovic Courtès writes: > >> ng0 skribis: >> >>> should we package ghc 8 in core-updates? It was released in May: >>> https://ghc.haskell.org/trac/ghc/blog/ghc-8.0.1-released >> >> Probably a good idea. :-) >> >> This can be done in ‘master’, or, if we change to default GHC, to

Re: [PATCH] gnu: rottlog: rotate messages daily.

2016-09-07 Thread Ludovic Courtès
Hi! Jan Nieuwenhuizen skribis: > Using the attached patch and the configuration below, rottlog > actually rotates /var/log/messages daily. Woohoo! > From c7fc570327faeb50503494b370a2f5ab21d4049b Mon Sep 17 00:00:00 2001 > From: Jan Nieuwenhuizen > Date: Sat, 18 Jun 2016 22:37:48 +0200 > Subje

Re: [PATCH] scripts: hash: Add --exclude-.git option.

2016-09-07 Thread Ludovic Courtès
Jan Nieuwenhuizen skribis: > From 060f9123acd4c6771e976c5442361285f8c8bc89 Mon Sep 17 00:00:00 2001 > From: Jan Nieuwenhuizen > Date: Tue, 6 Sep 2016 08:28:33 +0200 > Subject: [PATCH] scripts: hash: Add --exclude-vcs option. > > * guix/scripts/hash.scm (show-help): Add help text for --exclude-vc

Re: ghc 8

2016-09-07 Thread ng0
Ludovic Courtès writes: > ng0 skribis: > >> Ludovic Courtès writes: >> >>> ng0 skribis: >>> should we package ghc 8 in core-updates? It was released in May: https://ghc.haskell.org/trac/ghc/blog/ghc-8.0.1-released >>> >>> Probably a good idea. :-) >>> >>> This can be done in ‘master

Re: [PATCH] refresh nss-certs

2016-09-07 Thread Vincent Legoll
On Fri, Sep 2, 2016 at 2:21 PM, Ludovic Courtès wrote: > Leo Famulari skribis: > >> On Tue, Aug 30, 2016 at 01:33:10PM +0200, Vincent Legoll wrote: >>> Here it is... >>> I test-installed the 2 packages, but nothing more >> >>> From 966dd703fea7754d18fbe609215eff8381435458 Mon Sep 17 00:00:00 2001

Re: [PATCHv2 1/2] gnu: Add wlc.

2016-09-07 Thread Efraim Flashner
On Sat, Aug 27, 2016 at 08:17:09PM +0200, Tomáš Čech wrote: > * gnu/packages/freedesktop.scm(wlc): New variable. > * gnu/packages/patches/wlc-implement-wlc_view_get_pid.patch: Add it > * gnu/local.mk: Add entry for patch above. there's no patch attached > --- > gnu/packages/freedesktop.scm | 41

Re: [PATCHv2 1/2] gnu: Add wlc.

2016-09-07 Thread David Craven
> This results in it saying it can't find wayland. He's probably using the mesa enable wayland flags patch from core-updates...

Re: 02/11: activation: Allow home directories to be created under /var/lib.

2016-09-07 Thread Ludovic Courtès
David Craven skribis: >>> + (mkdir-p "/var/lib") > >>‘mkdir’ should be enough. > > I initially used mkdir-p... My bad, sorry! Ludo’.

Re: "move-phase-after"?

2016-09-07 Thread Ludovic Courtès
Hello, Danny Milosavljevic skribis: > On Tue, 6 Sep 2016 10:03:34 +0200 > Hartmut Goebel wrote: > >> for some package I need to switch the install and check phase. Could >> please someone point me to a function like "move-phase-after"? Thanks. > > I don't think this exists yet. > > See the ./g

Re: NPM and trusted binaries

2016-09-07 Thread Ludovic Courtès
Howdy, Pjotr Prins skribis: > On Tue, Sep 06, 2016 at 11:48:04AM -0400, Thompson, David wrote: >> On Sun, Sep 4, 2016 at 10:11 AM, Jan Nieuwenhuizen wrote: >> >> >* add --binary option to importer, sets (arguments (#:binary? #t)) >> >> This violates a core principle of Guix: reproducible

Re: [PATCH] gnu: Add rpc-daemon service

2016-09-07 Thread Ludovic Courtès
Hi! John Darrington skribis: > If I might be allowed to give my opinion though ... I think this way of > documenting > things is of limited help to potential users. It does nothing more than > repeat what > is written in the code. If that is what we want, then we could use some kind > of

Re: [PATCH] gnu: rottlog: rotate messages daily.

2016-09-07 Thread Jan Nieuwenhuizen
Ludovic Courtès writes: >> Using the attached patch and the configuration below, rottlog >> actually rotates /var/log/messages daily. > > Woohoo! :-) Yeah, made me quite happy too. >> * gnu/packages/admin.scm (rottlog): Set packdir in etc/rc; fixes rotating. >> Rename weekly to daily; rotates /

Re: [PATCHv2 2/2] gnu: Add sway.

2016-09-07 Thread Efraim Flashner
On Sat, Aug 27, 2016 at 08:17:10PM +0200, Tomáš Čech wrote: > * gnu/packages/freedesktop.scm(sway): New variable. > --- > gnu/packages/freedesktop.scm | 44 > > 1 file changed, 44 insertions(+) here you're missing the patch and registering it in gnu/l

Re: [PATCH 1/2] gnu: man-db: Use modify-phases syntax.

2016-09-07 Thread Ludovic Courtès
Efraim Flashner skribis: > On Wed, Sep 07, 2016 at 10:47:06AM +0200, Ricardo Wurmus wrote: >> * gnu/packages/man.scm (man-db)[arguments]: Use modify-phases syntax. [...] > The patches look good to me. Also my quick test didn't show it causing > mass rebuilds. Same here. Thanks for finding out

Re: [PATCH] gnu: Add mpop.

2016-09-07 Thread Ludovic Courtès
Arun Isaac skribis: > * gnu/packages/mail.scm (mpop): New variable. I removed the tabs reported by ‘guix lint’ and committed. Thank you! Ludo’.

Re: Prototype for using Guix with python packages

2016-09-07 Thread Ludovic Courtès
Hello! Christopher Baines skribis: > For a few months now, I've been assembling a prototype for how packages > could be produced for software released as Python source distributions > (sdists) [1]. Woow, quite an achievement! Do you know how many of the automatically generated packages built f

Re: [PATCH] Add Zsh completion file.

2016-09-07 Thread Ludovic Courtès
Eric Le Bihan skribis: > * etc/completion/zsh/_guix: New file. > * Makefile.am (dist_zshcompletion_DATA): New variable. > * configure.ac: Add --with-zsh-completion-dir. Applied with reindentation in configure.ac. Thank you! Ludo’.

[PATCH] gnu: r-curl: Respect CURL_CA_BUNDLE variable.

2016-09-07 Thread Ricardo Wurmus
* gnu/packages/web.scm (r-curl)[arguments]: Add phase "allow-CURL_CA_BUNDLE". --- gnu/packages/web.scm | 13 + 1 file changed, 13 insertions(+) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 87bc3e2..321a250 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm

Guile 2.2 packages

2016-09-07 Thread Ludovic Courtès
Hello! The Guile 2.2 series is becoming a reality, so time has come to provide packages built with/for Guile 2.2 (aka. 2.1, aka. ‘guile-next’). Commit 947a5d47a50252cb0b87b78a8f83f274dec593e2 adds a ‘package-for-guile-2.2’ procedure similar in spirit to ‘package-with-python2’. It provides a simp

Re: Guile 2.2 packages

2016-09-07 Thread Ricardo Wurmus
Ludovic Courtès writes: > Hello! > > The Guile 2.2 series is becoming a reality, so time has come to provide > packages built with/for Guile 2.2 (aka. 2.1, aka. ‘guile-next’). [...] > > The main difficulty is that upstream build systems and some of our > recipes hard-code “/2.0” in the name of

Re: Guile 2.2 packages

2016-09-07 Thread Danny Milosavljevic
Hi Ludo, does that mean we can fix guile-emacs? I've just updated to the latest version that is in Guix and I get: Throw to key system-error with args ("load-thunk-from-memory" "A" ("No such file or directory") (2))Threads explicit registering is not previously enabled. The same problem existe

Re: NPM and trusted binaries

2016-09-07 Thread Jan Nieuwenhuizen
Ludovic Courtès writes: >> Still, I think Guix would benefit from a somewhat more relaxed stance >> in this. > > It’s part of Guix’s mission to build from source whenever that is > possible, which is the case here, AIUI. Yes, I thought so too...I shared my findings to get more viewpoints on this

Alice, Bob's brother

2016-09-07 Thread Efraim Flashner
I've been using the lightweight-desktop template for quite a while now as a starting point for my own VM templates, and I've only now discovered that Alice, on occasion, is Bob's brother. Attached is a patch correcting this. -- Efraim Flashner אפרים פלשנר GPG key = A28B F40C 3E55 1372 662D

Re: Alice, Bob's brother

2016-09-07 Thread David Craven
You could have just pushed without submitting to ML xD

Re: [PATCH] gnu: Add mpop.

2016-09-07 Thread Arun Isaac
>> * gnu/packages/mail.scm (mpop): New variable. > > I removed the tabs reported by ‘guix lint’ and committed. Oh, I forgot to run 'guix lint'. My bad... Thanks, Arun Isaac.

Re: [PATCH 1/2] gnu: man-db: Use modify-phases syntax.

2016-09-07 Thread Ricardo Wurmus
Ludovic Courtès writes: > Efraim Flashner skribis: > >> On Wed, Sep 07, 2016 at 10:47:06AM +0200, Ricardo Wurmus wrote: >>> * gnu/packages/man.scm (man-db)[arguments]: Use modify-phases syntax. > > [...] > >> The patches look good to me. Also my quick test didn't show it causing >> mass rebuild

[PATCH] gnu: Add perl-mhonarc.

2016-09-07 Thread ng0
* gnu/packages/mail.scm (perl-mhonarc): New variable. --- gnu/packages/mail.scm | 23 +++ 1 file changed, 23 insertions(+) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index c2fc1a9..9740339 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -1388,

[PATCH] gnu: Use a directory owned by ntpd user for drift file.

2016-09-07 Thread John Darrington
Fixes bug #24366 * gnu/services/networking.scm (ntp-shepherd-service): Create new directory at startup. --- gnu/services/networking.scm | 20 ++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/gnu/services/networking.scm b/gnu/services/networking.scm index 71f4

[PATCH] gnu: Add nfs-utils

2016-09-07 Thread John Darrington
* gnu/packages/linux.scm (nfs-utils): New variable. --- gnu/packages/linux.scm | 87 +- 1 file changed, 86 insertions(+), 1 deletion(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 030e35e..eb9cb03 100644 --- a/gnu/packages/lin

Re: [PATCH v2 0/5] Add FPGA Tools

2016-09-07 Thread Danny Milosavljevic
Ping. This is the newest version of the patch series that includes the changes you suggested.

Re: Alice, Bob's brother

2016-09-07 Thread Ludovic Courtès
Efraim Flashner skribis: > I've been using the lightweight-desktop template for quite a while now > as a starting point for my own VM templates, and I've only now > discovered that Alice, on occasion, is Bob's brother. Attached is a > patch correcting this. Thanks for the fix! Please push it A

Four thousand!

2016-09-07 Thread Ludovic Courtès
Hello Guix! I wonder which one was the 4,000th, but we made it: --8<---cut here---start->8--- $ GUIX_PACKAGE_PATH= ./pre-inst-env guix package -A |wc -l 4005 $ git describe v0.11.0-891-g947a5d4 --8<---cut here---end--->8---

Re: [PATCH] gnu: Add nfs-utils

2016-09-07 Thread John Darrington
On Wed, Sep 07, 2016 at 10:29:37PM +0200, Danny Milosavljevic wrote: > + `("--without-tcp-wrappers" ^^^ Since you also provided tcp-wrappers in a seperate patch, was this on purpose? Yes. It was. There are some unresolved issues with tcp-wrappers vs. NFS. J' -

Re: [PATCH] gnu: Add nfs-utils

2016-09-07 Thread Danny Milosavljevic
> + `("--without-tcp-wrappers" ^^^ Since you also provided tcp-wrappers in a seperate patch, was this on purpose?

Re: [PATCH] gnu: Use a directory owned by ntpd user for drift file.

2016-09-07 Thread Ludovic Courtès
John Darrington skribis: > Fixes bug #24366 Rather: Fixes . (See ‘git log’ for examples.) > > > > * gnu/services/networking.scm (ntp-shepherd-service): Create new > directory at startup. Please mention the new variables and changes. > +(define (ntp-service-activ

Re: Tracking package submissions with Debbugs

2016-09-07 Thread Ludovic Courtès
ng0 skribis: > David Craven writes: > >>> 1. Our commit history is not full of merges of tiny branches, which is >>> what GitHub (and I thought Gitlab) encourages. >> >> Yes, that is right. But as I mentioned in a different thread, there >> are many projects where the maintainers agree to no

Re:Four thousand!

2016-09-07 Thread d4n1
uhuuu :) Daniel Pimentel (aka d4n1)On l...@gnu.org, Sep 7, 2016 5:29 PM wrote:Hello Guix! I wonder which one was the 4,000th, but we made it: --8<---cut here---start->8--- $ GUIX_PACKAGE_PATH= ./pre-inst-env guix package -A |wc -l 4005 $ git describe

Re: Guile 2.2 packages

2016-09-07 Thread Ludovic Courtès
Hello, Danny Milosavljevic skribis: > does that mean we can fix guile-emacs? I don’t know. What you describe sounds a lot like a search path issue. This works well (albeit slowly): guix environment --ad-hoc --pure guile-emacs -- emacs -q Ludo’.

Re: Novena

2016-09-07 Thread Ludovic Courtès
Hello, Danny Milosavljevic skribis: > can someone with a Novena please do > > $ cat /proc/cpuinfo > > on it? > > Also, if applicable, try > > $ ls /sys/firmware/efi/vars >From one of our build machines: --8<---cut here---start->8--- $ cat /proc/cpuinfo proce

Re: Guile 2.2 packages

2016-09-07 Thread Danny Milosavljevic
Hi, On Wed, 07 Sep 2016 22:49:12 +0200 l...@gnu.org (Ludovic Courtès) wrote: > I don’t know. >What you describe sounds a lot like a search path issue. It is a search path issue. Does package-for-guile-2.2 take it into account? Your E-mail contains: The following environment variable definitio

[PATCH 1/1] gnu: curl: Update replacement to 7.50.2 [fixes CVE-2016-7141].

2016-09-07 Thread Leo Famulari
* gnu/packages/curl.scm (curl)[replacement]: Update to 7.50.2 (curl-7.50.1): Replace with ... (curl-7.50.2): ... this. --- gnu/packages/curl.scm | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/curl.scm b/gnu/packages/curl.scm index a250bb1..f3c0ade 100644 -

[PATCH 0/1] Update curl replacement to 7.50.2

2016-09-07 Thread Leo Famulari
The curl project disclosed a bug, CVE-2016-7141 [0]: --- libcurl built on top of NSS (Network Security Services) incorrectly re-used client certificates if a certificate from file was used for one TLS connection but no certificate set for a subsequent TLS connection. While the symptoms are simila

Re: Guile 2.2 packages

2016-09-07 Thread Danny Milosavljevic
On Wed, 7 Sep 2016 23:15:22 +0200 Danny Milosavljevic wrote: >export PATH="foo/bin${PATH:+:}$PATH" >export > GUILE_LOAD_PATH="foo/share/guile/site/2.0${GUILE_LOAD_PATH:+:}$GUILE_LOAD_PATH" >export > GUILE_LOAD_COMPILED_PATH="foo/lib/guile/2.0/ccache:foo/share/guile/site/2.0${GUILE_L

Re: Four thousand!

2016-09-07 Thread Christopher Allan Webber
Ludovic Courtès writes: > Hello Guix! > > I wonder which one was the 4,000th, but we made it: > > --8<---cut here---start->8--- > $ GUIX_PACKAGE_PATH= ./pre-inst-env guix package -A |wc -l > 4005 Woohoo, over 4k! Now I can't wait until we're over nine thousann

[PATCH 0/3] Add utox

2016-09-07 Thread Erik Edrosa
Hello guix, These patches add utox, a lightweight client for tox, and it depedencies. This was requested by ng0 to send to the mailing list. One of the issues I discovered was avatars were not working. I will try to look into it when I have the chance. - Erik (OrangeShark) Erik Edrosa (3):

[PATCH 2/3] gnu: Add filteraudio.

2016-09-07 Thread Erik Edrosa
* gnu/packages/audio.scm (filteraudio): New variable. --- gnu/packages/audio.scm | 31 +++ 1 file changed, 31 insertions(+) diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 40cc029..4a6f400 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.

[PATCH 3/3] gnu: Add utox.

2016-09-07 Thread Erik Edrosa
* gnu/packages/messaging.scm (utox): New variable. --- gnu/packages/messaging.scm | 44 +++- 1 file changed, 43 insertions(+), 1 deletion(-) diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index b95239a..27086c8 100644 --- a/gnu/package

[PATCH 1/3] gnu: openal: Update to 1.17.2.

2016-09-07 Thread Erik Edrosa
* gnu/packages/audio.scm (openal): Update to 1.17.2. --- gnu/packages/audio.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 9f03368..40cc029 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -1468,7

Re: NPM and trusted binaries

2016-09-07 Thread Mike Gerwitz
On Tue, Sep 06, 2016 at 18:50:48 +0200, Pjotr Prins wrote: > On Tue, Sep 06, 2016 at 11:48:04AM -0400, Thompson, David wrote: >> This violates a core principle of Guix: reproducible builds. I don't >> support patches that encourage using pre-built binaries. > > In principle I agree. We want to be

Re: [PATCH 1/1] gnu: curl: Update replacement to 7.50.2 [fixes CVE-2016-7141].

2016-09-07 Thread Efraim Flashner
On Wed, Sep 07, 2016 at 06:04:23PM -0400, Leo Famulari wrote: > * gnu/packages/curl.scm (curl)[replacement]: Update to 7.50.2 > (curl-7.50.1): Replace with ... > (curl-7.50.2): ... this. > --- > gnu/packages/curl.scm | 8 > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a