diff options
| author | Marius Bakke <marius@gnu.org> | 2020-11-07 21:33:32 +0100 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2020-11-07 21:33:32 +0100 |
| commit | 32787d652460871a79f99b63230f92759e2e0de2 (patch) | |
| tree | ce883cac0d602b10b7c005755d035a08197e73a9 /nix | |
| parent | 052939c2f6e36de00a5e756ea29a4cc96884a55d (diff) | |
| parent | c2396ceb6eb30ac87755eb8b39583403b35fbd12 (diff) | |
| download | guix-patches-32787d652460871a79f99b63230f92759e2e0de2.tar guix-patches-32787d652460871a79f99b63230f92759e2e0de2.tar.gz | |
Merge branch 'master' into staging
Conflicts:
gnu/local.mk
gnu/packages/gdb.scm
gnu/packages/lisp-xyz.scm
gnu/packages/web-browsers.scm
Diffstat (limited to 'nix')
| -rw-r--r-- | nix/local.mk | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/nix/local.mk b/nix/local.mk index 2bb01041b9..d2ce349d9c 100644 --- a/nix/local.mk +++ b/nix/local.mk @@ -211,6 +211,7 @@ CLEANFILES += \ EXTRA_DIST += \ %D%/AUTHORS \ %D%/COPYING \ + etc/gnu-store.mount.in \ etc/guix-daemon.service.in \ etc/guix-daemon.conf.in \ etc/guix-publish.service.in \ |