diff mbox series

[bug#52346] gnu: ninja: Update to 1.10.2.

Message ID 20211207073039.18890-1-jgart@dismail.de
State Accepted
Headers show
Series [bug#52346] gnu: ninja: Update to 1.10.2. | expand

Checks

Context Check Description
cbaines/applying patch fail View Laminar job
cbaines/issue success View issue
cbaines/applying patch fail View Laminar job
cbaines/issue success View issue
cbaines/applying patch fail View Laminar job
cbaines/issue success View issue
cbaines/applying patch fail View Laminar job
cbaines/issue success View issue

Commit Message

jgart Dec. 7, 2021, 7:30 a.m. UTC 
* gnu/packages/ninja.scm (ninja): Update to 1.10.2.
---
 gnu/packages/ninja.scm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

Comments

Liliana Marie Prikler Dec. 7, 2021, 8:26 a.m. UTC | #1 
This has already been taken care of on core-updates-frozen [1], have
some patience ;)

[1] 
http://git.savannah.gnu.org/cgit/guix.git/commit/?id=bd6cb1d4ebb3da1110025e1a73a299bed4174035
jgart Dec. 7, 2021, 10:02 a.m. UTC | #2 
On Tue, 07 Dec 2021 09:26:51 +0100 Liliana Marie Prikler <liliana.prikler@ist.tugraz.at> wrote:
> This has already been taken care of on core-updates-frozen [1], have
> some patience ;)

hahah

How do you usually keep up to date with core-updates-frozen, etc...?

rss feeds, email list for cuf?

all best,

jgart
> 
> [1] 
> http://git.savannah.gnu.org/cgit/guix.git/commit/?id=bd6cb1d4ebb3da1110025e1a73a299bed4174035
> 
>
Liliana Marie Prikler Dec. 7, 2021, 10:17 a.m. UTC | #3 
Am Dienstag, den 07.12.2021, 05:02 -0500 schrieb jgart:
> hahah
> 
> How do you usually keep up to date with core-updates-frozen, etc...?
> 
> rss feeds, email list for cuf?
I (personally) don't.  I simply recognized ninja as a package that
would require almost a world rebuild and then checked savannah.  You
can of course also keep yourself updated through git pull, but what's
the fun in doing that? :P
Efraim Flashner Dec. 7, 2021, 11:50 a.m. UTC | #4 
On Tue, Dec 07, 2021 at 05:02:58AM -0500, jgart via Guix-patches via wrote:
> On Tue, 07 Dec 2021 09:26:51 +0100 Liliana Marie Prikler <liliana.prikler@ist.tugraz.at> wrote:
> > This has already been taken care of on core-updates-frozen [1], have
> > some patience ;)
> 
> hahah
> 
> How do you usually keep up to date with core-updates-frozen, etc...?
> 
> rss feeds, email list for cuf?
> 

git worktrees :)

> > 
> > [1] 
> > http://git.savannah.gnu.org/cgit/guix.git/commit/?id=bd6cb1d4ebb3da1110025e1a73a299bed4174035
> > 
>
jgart Dec. 7, 2021, 9:28 p.m. UTC | #5 
On Tue, 07 Dec 2021 13:50:52 +0200 Efraim Flashner <efraim@flashner.co.il> wrote:
> On Tue, Dec 07, 2021 at 05:02:58AM -0500, jgart via Guix-patches via wrote:
> > On Tue, 07 Dec 2021 09:26:51 +0100 Liliana Marie Prikler <liliana.prikler@ist.tugraz.at> wrote:
> > > This has already been taken care of on core-updates-frozen [1], have
> > > some patience ;)
> > 
> > hahah
> > 
> > How do you usually keep up to date with core-updates-frozen, etc...?
> > 
> > rss feeds, email list for cuf?
> > 
> 
> git worktrees :)

Efraim,

What's your workflow for using git worktrees when doing Guix development?

I remember Raghav using them and he showed me briefly but it felt a bit
like a branches, maybe cleaner for bootstrapping and switching to a new
tree. I didn't get around to incorporating it into my own workflow.

Any advice is much appreciated,

jgart

> 
> > > 
> > > [1] 
> > > http://git.savannah.gnu.org/cgit/guix.git/commit/?id=bd6cb1d4ebb3da1110025e1a73a299bed4174035
> > > 
> > 
> 
> -- 
> 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
Efraim Flashner Dec. 8, 2021, 9:30 a.m. UTC | #6 
On Tue, Dec 07, 2021 at 04:28:30PM -0500, jgart wrote:
> On Tue, 07 Dec 2021 13:50:52 +0200 Efraim Flashner <efraim@flashner.co.il> wrote:
> > On Tue, Dec 07, 2021 at 05:02:58AM -0500, jgart via Guix-patches via wrote:
> > > On Tue, 07 Dec 2021 09:26:51 +0100 Liliana Marie Prikler <liliana.prikler@ist.tugraz.at> wrote:
> > > > This has already been taken care of on core-updates-frozen [1], have
> > > > some patience ;)
> > > 
> > > hahah
> > > 
> > > How do you usually keep up to date with core-updates-frozen, etc...?
> > > 
> > > rss feeds, email list for cuf?
> > > 
> > 
> > git worktrees :)
> 
> Efraim,
> 
> What's your workflow for using git worktrees when doing Guix development?
> 
> I remember Raghav using them and he showed me briefly but it felt a bit
> like a branches, maybe cleaner for bootstrapping and switching to a new
> tree. I didn't get around to incorporating it into my own workflow.
> 
> Any advice is much appreciated,
> 
> jgart

It's quite expensive with Guix to switch between different branches due
to the compiled guile code. By keeping different branches in different
directories I can work on them concurrently without needing to recompile
when switching between branches. It's basically like checking out the
repository multiple times in different directories, but they all use the
.git folder from the original checkout.

(ins)efraim@3900XT ~/workspace/guix$ git worktree list
/home/efraim/workspace/guix                   ddcec589bc [master]
/home/efraim/workspace/guix-core-updates      ee03b51f6e [core-updates-frozen]
/home/efraim/workspace/guix-riscv             34758aca7c [wip-riscv]
/home/efraim/workspace/guix-staging           eec94982b1 [staging]
/home/efraim/workspace/guix-upstream-keyring  702f4c7942 [keyring]
/home/efraim/workspace/guix-wip-rust          ed496cb639 [wip-rust]

The basic command I follow is 'git worktree add <path> <branch>', so
'git worktree add ../guix-core-updates origin/core-updates-frozen'. Then
I change it to what I actually wanted, a local branch named
core-updates, tracking origin/core-updates-frozen (I can never get some
of those commands correct). Then I run bootstrap, configure and make in
that directory and I can work on both branches at the same time.

I'm not sure about the syntax since I often seem to get the worktree and
branching syntax wrong (and end up creating a local branch named
origin/core-updates, tracking my local core-updates branch), but it's
great for keeping track of everything at once.

Once most of my wip-riscv branch is merged back in I'll remove the
actual worktree with 'git worktree remove <something>' and then just
keep the wip-riscv branch.
jgart Dec. 16, 2021, 6:29 a.m. UTC | #7 
On Wed, 08 Dec 2021 11:30:50 +0200 Efraim Flashner <efraim@flashner.co.il> wrote:

Hi Efraim,

Thanks for sharing your workflow. It's much appreciated. 

I think this will finally get me started on incorporating worktrees into mine.

all best,

jgart
diff mbox series

Patch

diff --git a/gnu/packages/ninja.scm b/gnu/packages/ninja.scm
index 11ee472d56..54ae43f658 100644
--- a/gnu/packages/ninja.scm
+++ b/gnu/packages/ninja.scm
@@ -4,6 +4,7 @@ 
 ;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;; Copyright © 2020 Marius Bakke <mbakke@fastmail.com>
+;;; Copyright © 2021 jgart <jgart@dismail.de>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -31,7 +32,7 @@  (define-module (gnu packages ninja)
 (define-public ninja
   (package
     (name "ninja")
-    (version "1.10.0")
+    (version "1.10.2")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -40,7 +41,7 @@  (define-public ninja
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "1fbzl7mrcrwp527sgkc1npfl3k6bbpydpiq98xcf1a1hkrx0z5x4"))))
+                "0mspq4mvx41qri2v2zlg2y3znx5gfw6d8s3czbcfpr2218qbpz55"))))
     (build-system gnu-build-system)
     (inputs `(("python" ,python-wrapper)))
     (arguments