[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: Merge branch 'master' into core-updates
|
From: |
guix-commits |
|
Subject: |
01/01: Merge branch 'master' into core-updates |
|
Date: |
Sat, 24 Nov 2018 13:45:54 -0500 (EST) |
mbakke pushed a commit to branch core-updates
in repository guix.
commit 4820b75de0688ed3df3a94d69240f41984d1fb3c
Merge: 1261804 1b30832
Author: Marius Bakke <address@hidden>
Date: Sat Nov 24 19:44:05 2018 +0100
Merge branch 'master' into core-updates
gnu/local.mk | 1 +
gnu/packages/clojure.scm | 293 ++++++++++++++++++++++++++++++++++
gnu/packages/file-systems.scm | 49 ++++++
gnu/packages/freedesktop.scm | 6 +-
gnu/packages/gnome.scm | 2 +-
gnu/packages/linux.scm | 16 +-
gnu/packages/lisp.scm | 354 +++---------------------------------------
gnu/packages/ocaml.scm | 1 -
gnu/packages/scheme.scm | 51 ++++++
guix/build-system/clojure.scm | 2 +-
10 files changed, 431 insertions(+), 344 deletions(-)