diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2015-03-25 10:52:52 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2015-03-25 10:52:52 +0100 |
| commit | 25d5b708a636ecf779035f75ad110574fc0262b9 (patch) | |
| tree | 7d8429a59b7523d79790c5f4cdb5b96fabe8494e /gnu-system.am | |
| parent | 17287d7d47567aa1649250182e0f7ab11d5d55d1 (diff) | |
| parent | 614c2188420a266ec512c9c04af3bb2ea46c4dc4 (diff) | |
| download | guix-25d5b708a636ecf779035f75ad110574fc0262b9.tar.gz guix-25d5b708a636ecf779035f75ad110574fc0262b9.zip | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu-system.am')
| -rw-r--r-- | gnu-system.am | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/gnu-system.am b/gnu-system.am index 2bed50fc40..153d395b57 100644 --- a/gnu-system.am +++ b/gnu-system.am @@ -156,6 +156,7 @@ GNU_SYSTEM_MODULES = \ gnu/packages/iso-codes.scm \ gnu/packages/java.scm \ gnu/packages/jrnl.scm \ + gnu/packages/julia.scm \ gnu/packages/kde.scm \ gnu/packages/key-mon.scm \ gnu/packages/language.scm \ @@ -374,6 +375,7 @@ dist_patch_DATA = \ gnu/packages/patches/binutils-ld-new-dtags.patch \ gnu/packages/patches/binutils-loongson-workaround.patch \ gnu/packages/patches/calibre-drop-unrar.patch \ + gnu/packages/patches/calibre-no-updates-dialog.patch \ gnu/packages/patches/cdparanoia-fpic.patch \ gnu/packages/patches/chmlib-inttypes.patch \ gnu/packages/patches/clucene-pkgconfig.patch \ @@ -461,6 +463,7 @@ dist_patch_DATA = \ gnu/packages/patches/mhash-keygen-test-segfault.patch \ gnu/packages/patches/mit-krb5-init-fix.patch \ gnu/packages/patches/mpc123-initialize-ao.patch \ + gnu/packages/patches/mplayer2-theora-fix.patch \ gnu/packages/patches/module-init-tools-moduledir.patch \ gnu/packages/patches/mupdf-buildsystem-fix.patch \ gnu/packages/patches/mutt-CVE-2014-9116.patch \ |