diff options
| author | Liliana Marie Prikler <liliana.prikler@gmail.com> | 2023-09-22 23:54:34 +0200 |
|---|---|---|
| committer | Liliana Marie Prikler <liliana.prikler@gmail.com> | 2023-09-22 23:54:34 +0200 |
| commit | cdbd81ce144f17644ceebd3d08723aa244696a05 (patch) | |
| tree | f2d4c484a5a8880fb32b81ac4330842c88a53e2a /etc | |
| parent | 10664c0f1c351eae24629127d97fe23f5e18a93c (diff) | |
| parent | ec130e1a1b7f3b87b1a6e626754f7e7a07f6b717 (diff) | |
| download | guix-cdbd81ce144f17644ceebd3d08723aa244696a05.tar.gz guix-cdbd81ce144f17644ceebd3d08723aa244696a05.zip | |
Merge branch 'master' into emacs-team
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/hurd-manifest.scm | 5 | ||||
| -rw-r--r-- | etc/teams.scm.in | 4 | ||||
| -rw-r--r-- | etc/time-travel-manifest.scm | 21 |
3 files changed, 23 insertions, 7 deletions
diff --git a/etc/hurd-manifest.scm b/etc/hurd-manifest.scm index 1b1d0a53b4..8132da7d08 100644 --- a/etc/hurd-manifest.scm +++ b/etc/hurd-manifest.scm @@ -31,7 +31,7 @@ (srfi srfi-1)) (use-package-modules - base bootloaders commencement compression file gawk gdb gettext guile + base bootloaders commencement compression file gawk gdb gettext gtk guile hurd less m4 package-management python ssh version-control) (define (input->package input) @@ -72,6 +72,9 @@ ;; system grub-minimal grub + ;; system reconfigure + gdk-pixbuf + (append guix-dependencies %base-packages/hurd))) diff --git a/etc/teams.scm.in b/etc/teams.scm.in index e07c758117..876050da9c 100644 --- a/etc/teams.scm.in +++ b/etc/teams.scm.in @@ -639,6 +639,10 @@ GLib/GIO, GTK, GStreamer and Webkit." "cox.katherine.e+guix@gmail.com") emacs go lisp) +(define-member (person "Marius Bakke" + "marius@gnu.org") + python) + (define (find-team name) (or (hash-ref %teams (string->symbol name)) diff --git a/etc/time-travel-manifest.scm b/etc/time-travel-manifest.scm index ab890dd903..80c4c7c346 100644 --- a/etc/time-travel-manifest.scm +++ b/etc/time-travel-manifest.scm @@ -66,12 +66,21 @@ (define %release-commits ;; Release commits: the list of version/commit pairs. - '(("1.3.0" . "a0178d34f582b50e9bdbb0403943129ae5b560ff") - ("1.2.0" . "a099685659b4bfa6b3218f84953cbb7ff9e88063") - ("1.1.0" . "d62c9b2671be55ae0305bebfda17b595f33797f2") - ("1.0.1" . "d68de958b60426798ed62797ff7c96c327a672ac") - ("1.0.0" . "6298c3ffd9654d3231a6f25390b056483e8f407c") - ("0.16.0" . "4a0b87f0ec5b6c2dcf82b372dd20ca7ea6acdd9c"))) + '(("1.4.0" . "8e2f32cee982d42a79e53fc1e9aa7b8ff0514714") + ("1.3.0" . "a0178d34f582b50e9bdbb0403943129ae5b560ff") + + ;; FIXME: To merely compute the derivation of these revisions, we need to + ;; be able to build their dependencies. However, pre-built binaries are + ;; currently missing and some of these no longer build from source due to + ;; time bombs like <https://issues.guix.gnu.org/58650>. Thus, comment + ;; them output until we have substitutes for these old things. + + ;; ("1.2.0" . "a099685659b4bfa6b3218f84953cbb7ff9e88063") + ;; ("1.1.0" . "d62c9b2671be55ae0305bebfda17b595f33797f2") + ;; ("1.0.1" . "d68de958b60426798ed62797ff7c96c327a672ac") + ;; ("1.0.0" . "6298c3ffd9654d3231a6f25390b056483e8f407c") + ;; ("0.16.0" . "4a0b87f0ec5b6c2dcf82b372dd20ca7ea6acdd9c") + )) (manifest (map (match-lambda |