mbakke pushed a commit to branch master
in repository guix.
commit c567a82a6975e70c8207a4aeed55a72b5121213c
Merge: 3a84b4ec4c 322917aeb8
Author: Marius Bakke
AuthorDate: Sun Oct 16 00:10:07 2022 +0200
Merge branch 'staging'
gnu/local.mk | 23 +-
mbakke pushed a commit to branch core-updates
in repository guix.
commit 80c76f5d8eaa0aff40c08eac19a62e0e7957a7c8
Merge: cbe461f2d4 2266ec5eb1
Author: Marius Bakke
AuthorDate: Sun Sep 18 16:30:21 2022 +0200
Merge branch 'staging' into core-updates
doc/guix.texi
mbakke pushed a commit to branch core-updates
in repository guix.
commit 7e0f2728a46b8f96b875a7199655bd63ad6a9fff
Merge: af53cf42b7 706e6c3c8f
Author: Marius Bakke
AuthorDate: Fri Sep 16 19:11:43 2022 +0200
Merge branch 'staging' into core-updates
NEWS
apteryx pushed a commit to branch core-updates
in repository guix.
commit 4920f6e634eeecb37b501bdc024dfe0aab849ed0
Merge: 513091dbd2 3d297a0017
Author: Maxim Cournoyer
AuthorDate: Thu Sep 15 11:29:02 2022 -0400
Merge branch 'staging' into core-updates
Conflicts resolved in:
mbakke pushed a commit to branch core-updates
in repository guix.
commit 1d526f5035ce51305d8f414b8f55066adedb6f91
Merge: b4693f4a58 07140e8b10
Author: Marius Bakke
AuthorDate: Sat Sep 10 17:30:17 2022 +0200
Merge branch 'staging' into core-updates
gnu/packages/bioconductor.scm | 6 +
mbakke pushed a commit to branch core-updates
in repository guix.
commit 9ef33dce949214d018774a4ff82f069b1a5e1f0f
Merge: 5fcbbe37c0 8fbd8c8245
Author: Marius Bakke
AuthorDate: Fri Sep 9 23:04:13 2022 +0200
Merge branch 'staging' into core-updates
doc/guix.texi
mbakke pushed a commit to branch core-updates
in repository guix.
commit 884548b476f2ee27c01cb0c9ad93c0cf9d33fa5e
Merge: 0e30579845 fa894b3f4d
Author: Marius Bakke
AuthorDate: Thu Sep 8 21:12:52 2022 +0200
Merge branch 'staging' into core-updates
.dir-locals.el
mbakke pushed a commit to branch core-updates
in repository guix.
commit 58863b93b0d9a191d5cca695fe0a0dfbb067ebba
Merge: 2e559a3585 0c518f974e
Author: Marius Bakke
AuthorDate: Thu Sep 1 23:26:57 2022 +0200
Merge branch 'staging' into core-updates
Makefile.am
mbakke pushed a commit to branch core-updates
in repository guix.
commit 59c136ef611b7a00683af1d1bb406dbd1af1a2bd
Merge: a6f4295362 d62fc2cc83
Author: Marius Bakke
AuthorDate: Tue Aug 30 20:18:55 2022 +0200
Merge branch 'staging' into core-updates
Makefile.am
civodul pushed a commit to branch master
in repository guix.
commit 6aa457fed15157495121646b57c22ec68af41fb7
Merge: d4482e9a9e 622545de6c
Author: Ludovic Courtès
AuthorDate: Mon Jun 13 08:57:51 2022 +0200
Merge branch 'staging'
gnu/local.mk | 1 +
apteryx pushed a commit to branch core-updates
in repository guix.
commit 0d41fe4855588fb659b8adafe215d5573517a79b
Merge: 7c57821c68 1a5302435f
Author: Maxim Cournoyer
AuthorDate: Tue Jan 25 23:36:11 2022 -0500
Merge branch 'staging' into core-updates.
With "conflicts" resolved in
lfam pushed a commit to branch master
in repository guix.
commit 75b775e81b5a81a59656eeba8811b42f45d503da
Merge: 847c816 0981f87
Author: Leo Famulari
AuthorDate: Mon Feb 1 14:18:38 2021 -0500
Merge branch 'staging'
gnu/local.mk | 9 +-
mbakke pushed a commit to branch master
in repository guix.
commit 4dadb4977908028bb0651d43ed4813cc988db92d
Merge: fe5c905 e827f40
Author: Marius Bakke
AuthorDate: Sat Nov 28 22:39:12 2020 +0100
Merge branch 'staging'
doc/guix.texi | 33 +-
apteryx pushed a commit to branch core-updates
in repository guix.
commit 5e2140511c1ad9ccd731438b74d61b62111da1e6
Merge: 9e3a5ee 353bdae
Author: Maxim Cournoyer
AuthorDate: Mon Oct 19 12:51:57 2020 -0400
Merge branch 'staging'
Conflicts:
gnu/packages/admin.scm
mbakke pushed a commit to branch master
in repository guix.
commit 8ab70bae52f8d4b6356ec3b8a88cebf9debe8520
Merge: 9bc516b 8ea91d0
Author: Marius Bakke
AuthorDate: Sat Jun 13 22:52:25 2020 +0200
Merge branch 'staging'
gnu/local.mk | 9 +-
mbakke pushed a commit to branch master
in repository guix.
commit aebba13c0bef5a58697f1a9fe8337967cc01300f
Merge: 747953c bb4674b
Author: Marius Bakke
AuthorDate: Sat Mar 14 12:57:21 2020 +0100
Merge branch 'staging'
gnu/local.mk| 1 -
mbakke pushed a commit to branch master
in repository guix.
commit 2cbccf7f653d54fc41962425920db095d230de62
Merge: 4730878 f10921c
Author: Marius Bakke
AuthorDate: Mon Feb 10 20:11:26 2020 +0100
Merge branch 'staging'
doc/guix.texi | 25 +-
mbakke pushed a commit to branch core-updates
in repository guix.
commit 12d8adbfc0f32a1905cfc3aaa2cfff68ee46a333
Merge: bd0f5f2 db0e9fe
Author: Marius Bakke
AuthorDate: Thu Jan 23 23:11:11 2020 +0100
Merge branch 'staging' into core-updates
gnu/installer/newt/user.scm
mbakke pushed a commit to branch core-updates
in repository guix.
commit 8ed9be3faccb865204de46d2a8ed3e96e59281b6
Merge: 36930b2 715110a
Author: Marius Bakke
AuthorDate: Tue Jan 21 22:39:42 2020 +0100
Merge branch 'staging' into core-updates
.mailmap
mbakke pushed a commit to branch master
in repository guix.
commit 6d15516dc6ffca3622ff49179c5c7c360c11b54b
Merge: 0ed75a5 982eff9
Author: Marius Bakke
AuthorDate: Tue Jan 7 17:43:20 2020 +0100
Merge branch 'staging'
gnu/local.mk | 4 ---
mbakke pushed a commit to branch master
in repository guix.
commit 1b1b006afd31c5526f34d157baef492c7dde2e9c
Merge: fc34abf 5e5cdac
Author: Marius Bakke
Date: Tue Aug 13 18:51:12 2019 +0200
Merge branch 'staging'
gnu/local.mk | 2 +-
mbakke pushed a commit to branch master
in repository guix.
commit 878a6baa4c705f4d551b60c5aa254246e0abc922
Merge: 1c65b0e 7a05fdd
Author: Marius Bakke
Date: Thu Jul 11 20:33:44 2019 +0200
Merge branch 'staging'
gnu/packages/base.scm| 14 +--
gnu/packages/certs.scm
mbakke pushed a commit to branch core-updates
in repository guix.
commit 6cb1ef9ea28ee14b3bb5442e8af1f54c27802f09
Merge: 20e4ee1 010689e
Author: Marius Bakke
Date: Thu Jun 20 23:38:56 2019 +0200
Merge branch 'staging' into core-updates
doc/guix.texi
mbakke pushed a commit to branch master
in repository guix.
commit a60dbad3bc8211cdec2f623306fc2e02f1cc17a1
Merge: c7fbf61 ed8d3f3
Author: Marius Bakke
Date: Sat Jun 15 09:46:12 2019 +0200
Merge branch 'staging'
gnu/packages/haskell.scm| 42
mbakke pushed a commit to branch master
in repository guix.
commit f388f4a5687b64795719a8db67486ec963083c3e
Merge: 3745909 2a9d89a
Author: Marius Bakke
Date: Thu Jun 13 15:27:30 2019 +0200
Merge branch 'staging'
gnu/local.mk | 2 -
civodul pushed a commit to branch master
in repository guix.
commit 7d62fa206b701504b110f253e3efb217eed475ad
Merge: c5db31d cd8dce8
Author: Ludovic Courtès
Date: Sun Apr 28 14:45:35 2019 +0200
Merge branch 'staging'
gnu/local.mk | 12 +-
mbakke pushed a commit to branch core-updates
in repository guix.
commit 8c14f7f8a7ab0722bf4c9f92fd28ae85514d564f
Merge: 2f33a73 3374e92
Author: Marius Bakke
Date: Sat Mar 23 23:16:55 2019 +0100
Merge branch 'staging' into core-updates
.mailmap
mbakke pushed a commit to branch core-updates
in repository guix.
commit 19008a22d18e772062952034c58a15ed341df3b5
Merge: 520ae43 c958c31
Author: Marius Bakke
Date: Thu Mar 14 16:30:19 2019 +0100
Merge branch 'staging' into core-updates
Makefile.am
mbakke pushed a commit to branch core-updates
in repository guix.
commit b4d7689f9255b93b9ea02e01dc490f1416f77782
Merge: dd7ce86 6d3cff5
Author: Marius Bakke
Date: Mon Mar 4 23:05:01 2019 +0100
Merge branch 'staging' into core-updates
doc/contributing.fr.texi |
mbakke pushed a commit to branch core-updates
in repository guix.
commit 9a6b8c9fa36bca5541336d61685ebdea10654ce4
Merge: 4e3a7d8 aa51eb2
Author: Marius Bakke
Date: Sun Feb 24 21:26:58 2019 +0100
Merge branch 'staging' into core-updates
Makefile.am
civodul pushed a commit to branch master
in repository guix.
commit 50a93adc05b611836e740c4b55571890f4c6770a
Merge: 722ac64 69fb26d
Author: Ludovic Courtès
Date: Sat Feb 9 15:14:59 2019 +0100
Merge branch 'staging'
doc/guix.texi | 38 +-
mbakke pushed a commit to branch core-updates
in repository guix.
commit 839167ff9d74fc490b32f6a197591964f73b65e5
Merge: 27c1df0 030c912
Author: Marius Bakke
Date: Sat Aug 25 16:44:07 2018 +0200
Merge branch 'staging' into core-updates
Makefile.am
mbakke pushed a commit to branch master
in repository guix.
commit a7bc1588e6b8ad4a890d9cc884016f36f92f2e7d
Merge: 8a502c3 df570bf
Author: Marius Bakke
Date: Sun Aug 19 15:24:59 2018 +0200
Merge branch 'staging'
gnu/local.mk | 3 +-
rekado pushed a commit to branch core-updates
in repository guix.
commit b86c019efbc5c4ea35f3cd6d2f52985f40e49e6c
Merge: 25bd726 7b38f04
Author: Ricardo Wurmus
Date: Mon Aug 13 20:39:08 2018 +0200
Merge branch 'staging' into core-updates
doc/guix.texi
mbakke pushed a commit to branch master
in repository guix.
commit 49b6dc2b4e02269850dacc71d9e7ec93139ec5b5
Merge: 7519dc9 2776b5d
Author: Marius Bakke
Date: Fri Jul 13 00:25:45 2018 +0200
Merge branch 'staging'
gnu/local.mk |7 +-
mbakke pushed a commit to branch master
in repository guix.
commit a66853810e75055091e9ab5c2fc341fa1811cda4
Merge: fb8966a a9fe388
Author: Marius Bakke
Date: Mon Apr 30 19:26:03 2018 +0200
Merge branch 'staging'
gnu/packages/build-tools.scm | 4 ++--
mbakke pushed a commit to branch master
in repository guix.
commit dc7e07c9b9780883a462c5973cd2ecad06fdb4ae
Merge: 616446f dbc75da
Author: Marius Bakke
Date: Tue Mar 20 14:13:05 2018 +0100
Merge branch 'staging'
gnu/local.mk |
mbakke pushed a commit to branch staging
in repository guix.
commit a248a9ac6a67213b177ab5ba9ec270638c9dd002
Merge: 5413074 7ac43c4
Author: Marius Bakke
Date: Mon Mar 12 18:22:53 2018 +0100
Merge branch 'staging-next' into staging
gnu/local.mk
mbakke pushed a commit to branch master
in repository guix.
commit 1c055d72585bd075e20ad0b41942d501d0b38656
Merge: 565e24c ffb4da7
Author: Marius Bakke
Date: Tue Oct 10 21:44:32 2017 +0200
Merge branch 'staging'
gnu/local.mk |
mbakke pushed a commit to branch master
in repository guix.
commit f484a50d50c3778df76d63533634a71cd7301558
Merge: 0efea21 de6f6ef
Author: Marius Bakke
Date: Mon Jun 5 00:36:11 2017 +0200
Merge branch 'staging'
gnu/local.mk |
lfam pushed a commit to branch master
in repository guix.
commit 2018eea07bb00663d2f0cec9d9085d51afa4513b
Merge: be58ffa 39d2d9a
Author: Leo Famulari
Date: Thu Apr 27 00:33:06 2017 -0400
Merge branch 'staging'
gnu/local.mk | 3
lfam pushed a commit to branch master
in repository guix.
commit 4a990395d749619c6e565c57a05c0ca9f6894eed
Merge: 0c6fc4b d94691e
Author: Leo Famulari
Date: Sun Dec 11 15:03:52 2016 -0500
Merge branch 'staging'
gnu/local.mk | 22
42 matches
Mail list logo