[PATCH 0/2] Update ldc to 1.1.0.

[PATCH 0/2] Update ldc to 1.1.0.

[Danny Milosavljevic]

Danny Milosavljevic (2):
  gnu: ldc: Rename ldc 0.17.2 to ldc-bootstrap.
  gnu: ldc: Update to 1.1.0.

 gnu/packages/ldc.scm | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

[PATCH 1/2] gnu: ldc: Rename ldc 0.17.2 to ldc-bootstrap.

[Danny Milosavljevic]

* gnu/packages/ldc.scm (ldc): Rename to...
  (ldc-bootstrap): ... this.
  (ldc-1.1.0-beta6): Replace ldc by ldc-bootstrap.
  [native-inputs]: Replace ldc by ldc-bootstrap.
---
 gnu/packages/ldc.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/ldc.scm b/gnu/packages/ldc.scm
index 4b10ac25e..778809968 100644
--- a/gnu/packages/ldc.scm
+++ b/gnu/packages/ldc.scm
@@ -77,7 +77,7 @@ minimize the amount of work necessary.  Unlike make, rdmd tracks dependencies
 and freshness without requiring additional information from the user.")
       (license license:boost1.0))))
 
-(define-public ldc
+(define-public ldc-bootstrap
   (package
     (name "ldc")
     (version "0.17.2")
@@ -182,7 +182,7 @@ latest DMD frontend and uses LLVM as backend.")
   ;; variable to hold this variable.
   (let ((older-version "1.1.0-beta4"))
     (package
-      (inherit ldc)
+      (inherit ldc-bootstrap)
       (name "ldc")
       (version "1.1.0-beta6")
       ;; Beta version needed to compile various scientific tools that require
@@ -227,7 +227,7 @@ latest DMD frontend and uses LLVM as backend.")
       (native-inputs
        `(("llvm" ,llvm)
          ("clang" ,clang)
-         ("ldc" ,ldc)
+         ("ldc" ,ldc-bootstrap)
          ("python-lit" ,python-lit)
          ("python-wrapper" ,python-wrapper)
          ("unzip" ,unzip)

[PATCH 2/2] gnu: ldc: Update to 1.1.0.

[Danny Milosavljevic]

* gnu/packages/ldc.scm (ldc-1.1.0-beta6): Rename to...
  (ldc): ... this.
  [version]: Modify.
  [source]: Modify.
  (ldc-beta): Remove variable.
---
 gnu/packages/ldc.scm | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/gnu/packages/ldc.scm b/gnu/packages/ldc.scm
index 778809968..3ae6b13bd 100644
--- a/gnu/packages/ldc.scm
+++ b/gnu/packages/ldc.scm
@@ -176,15 +176,15 @@ latest DMD frontend and uses LLVM as backend.")
                    license:boost1.0))))
 
 
-(define-public ldc-1.1.0-beta6
+(define-public ldc
   ;; The phobos, druntime and dmd-testsuite dependencies do not have a newer
   ;; release than 1.1.0-beta4, hence the need to make use of the older-version
   ;; variable to hold this variable.
-  (let ((older-version "1.1.0-beta4"))
+  (let ((older-version "1.1.0"))
     (package
       (inherit ldc-bootstrap)
       (name "ldc")
-      (version "1.1.0-beta6")
+      (version "1.1.0")
       ;; Beta version needed to compile various scientific tools that require
       ;; the newer beta versions, and won't compile successfully with the
       ;; older stable version.
@@ -196,7 +196,7 @@ latest DMD frontend and uses LLVM as backend.")
                 (file-name (string-append name "-" version ".tar.gz"))
                 (sha256
                  (base32
-                  "0n53brlkm86jjkppy9xmzx7nyxykzj68kcxgv8q7d10s5hfscxs8"))))
+                  "10zkrmx9bcmhfxvgykm3fkjamzc8js96wm032bv0fyil5c9ja2y1"))))
       (arguments
        `(#:phases
          (modify-phases %standard-phases
@@ -240,7 +240,7 @@ latest DMD frontend and uses LLVM as backend.")
                    older-version ".tar.gz"))
              (sha256
               (base32
-               "1iwy5rs0rqkicj1zfsa5yqvk8ard99bfr8g69qmhlbzb98q0kpks"))
+               "0z5v55b9s1ppf0c2ivjq7sbmq688c37c92ihc3qwrbxnqvkkvrlk"))
              ;; This patch deactivates some tests that depend on network access
              ;; to pass.  It also deactivates some tests that have some reliance
              ;; on timezone.
@@ -259,7 +259,7 @@ latest DMD frontend and uses LLVM as backend.")
                    older-version ".tar.gz"))
              (sha256
               (base32
-               "1qsiw5lz1pr8ms9myjf8b94nqi7f1781k226jvxwnhkjg11d0s63"))))
+               "07qvrqj6vgakd6qr4x5f70w6zwkzd1li5x8i1b5ywnds1z5lnfp6"))))
          ("dmd-testsuite-src"
           ,(origin
              (method url-fetch)
@@ -268,14 +268,12 @@ latest DMD frontend and uses LLVM as backend.")
                    older-version ".tar.gz"))
              (sha256
               (base32
-               "0jp54hyi75i9g41rvgmm3zg21yzv57q8dghrhb432rb0n9j15mbp"))
+               "12cak7yqmsgjlflx0dp6fwmwb9dac25amgi86n0bb95ard3547wy"))
              ;; Remove the gdb tests that fails with a "Error: No such file or
              ;; directory" error, despite the files being present in the debug
              ;; files left with the --keep-failed flag to guix build.
              (patches (search-patches "ldc-1.1.0-disable-dmd-tests.patch")))))))))
 
-(define-public ldc-beta ldc-1.1.0-beta6)
-
 (define-public dub
   (package
     (name "dub")

Re: [PATCH 2/2] gnu: ldc: Update to 1.1.0.

[Efraim Flashner]

[-- Attachment #1: Type: text/plain, Size: 763 bytes --]

On Wed, Feb 01, 2017 at 10:51:32AM +0100, Danny Milosavljevic wrote:
>               ;; files left with the --keep-failed flag to guix build.
>               (patches (search-patches "ldc-1.1.0-disable-dmd-tests.patch")))))))))
>  
> -(define-public ldc-beta ldc-1.1.0-beta6)
> -
>  (define-public dub
>    (package
>      (name "dub")
> 

Without having built it to test it out, I would replace this part with
either having it superceded by ldc-1.1.0, or have ldc-beta point to
ldc-1.1.0, so no one who relies on it finds it broken.


-- 
Efraim Flashner   <efraim@flashner.co.il>   אפרים פלשנר
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

Re: [PATCH 2/2] gnu: ldc: Update to 1.1.0.

[Danny Milosavljevic]

Hi,

On Fri, 3 Feb 2017 18:45:22 +0200
Efraim Flashner <efraim@flashner.co.il> wrote:

> On Wed, Feb 01, 2017 at 10:51:32AM +0100, Danny Milosavljevic wrote:
> >               ;; files left with the --keep-failed flag to guix build.
> >               (patches (search-patches "ldc-1.1.0-disable-dmd-tests.patch")))))))))
> >  
> > -(define-public ldc-beta ldc-1.1.0-beta6)
> > -

> Without having built it to test it out, I would replace this part with
> either having it superceded by ldc-1.1.0, or have ldc-beta point to
> ldc-1.1.0, so no one who relies on it finds it broken.

Ehhh. The variable "ldc-beta" would have existed for 5 days and was in no Guix release - not sure anyone saw it.

But we can do the latter so that people could rely on ldc-beta being the newest non-release ldc (if we ever packaged another ldc beta release or even git commit), kinda like guix-devel (corresponding to ldc-beta) vs. guix (corresponding to ldc). Sure.

Re: [PATCH 2/2] gnu: ldc: Update to 1.1.0.

[Ludovic Courtès]

Hi Danny,

Danny Milosavljevic <dannym@scratchpost.org> skribis:

> On Fri, 3 Feb 2017 18:45:22 +0200
> Efraim Flashner <efraim@flashner.co.il> wrote:
>
>> On Wed, Feb 01, 2017 at 10:51:32AM +0100, Danny Milosavljevic wrote:
>> >               ;; files left with the --keep-failed flag to guix build.
>> >               (patches (search-patches "ldc-1.1.0-disable-dmd-tests.patch")))))))))
>> >  
>> > -(define-public ldc-beta ldc-1.1.0-beta6)
>> > -
>
>> Without having built it to test it out, I would replace this part with
>> either having it superceded by ldc-1.1.0, or have ldc-beta point to
>> ldc-1.1.0, so no one who relies on it finds it broken.
>
> Ehhh. The variable "ldc-beta" would have existed for 5 days and was in no Guix release - not sure anyone saw it.
>
> But we can do the latter so that people could rely on ldc-beta being the newest non-release ldc (if we ever packaged another ldc beta release or even git commit), kinda like guix-devel (corresponding to ldc-beta) vs. guix (corresponding to ldc). Sure.

I agree.  Both patches look good to me, I think you can go ahead!

Thank you,
Ludo’.

Re: [PATCH 1/2] gnu: ldc: Rename ldc 0.17.2 to ldc-bootstrap.

[Danny Milosavljevic]

Applied as beffaf9a124e846eddd1519020c08ec6628fcd78 and pushed.

Re: [PATCH 2/2] gnu: ldc: Update to 1.1.0.

[Danny Milosavljevic]

Applied as 836cbd9f72fa3e2bcd4102c3db1b6f3c0671ed2f and pushed.