diff options
| author | Mark H Weaver <mhw@netris.org> | 2015-09-22 16:38:48 -0400 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2015-09-22 16:38:48 -0400 |
| commit | bd90127ad43d08c39e5bd592d03f7c0a4c683afe (patch) | |
| tree | c840851273e349cb0aee31cb5958acdf093c819a /gnu-system.am | |
| parent | 5f20553dee3fbc924b0cafb54ac215b0d3bf344c (diff) | |
| parent | 430505eba33b7bb59fa2d22e0f21ff317cbc320d (diff) | |
| download | guix-bd90127ad43d08c39e5bd592d03f7c0a4c683afe.tar guix-bd90127ad43d08c39e5bd592d03f7c0a4c683afe.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu-system.am')
| -rw-r--r-- | gnu-system.am | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/gnu-system.am b/gnu-system.am index bc108c85ad..f359a9b834 100644 --- a/gnu-system.am +++ b/gnu-system.am @@ -361,6 +361,7 @@ GNU_SYSTEM_MODULES = \ gnu/system/grub.scm \ gnu/system/install.scm \ gnu/system/linux.scm \ + gnu/system/linux-container.scm \ gnu/system/linux-initrd.scm \ gnu/system/locale.scm \ gnu/system/nss.scm \ @@ -524,6 +525,7 @@ dist_patch_DATA = \ gnu/packages/patches/libbonobo-activation-test-race.patch \ gnu/packages/patches/libcanberra-sound-theme-freedesktop.patch \ gnu/packages/patches/libevent-dns-tests.patch \ + gnu/packages/patches/libmtp-devices.patch \ gnu/packages/patches/liboop-mips64-deplibs-fix.patch \ gnu/packages/patches/liblxqt-include.patch \ gnu/packages/patches/libmad-armv7-thumb-pt1.patch \ |