diff options
author | Marius Bakke <mbakke@fastmail.com> | 2020-04-11 17:00:30 +0200 |
---|---|---|
committer | Marius Bakke <mbakke@fastmail.com> | 2020-04-11 17:00:30 +0200 |
commit | c6d02bcf1bcc06c70e440221e317274926c0fce3 (patch) | |
tree | 1698bf3728b013961cfdd14f731b4a55d1f409c0 /gnu/local.mk | |
parent | 2a2a9878682e4d959633ecab5275397809a1ce3f (diff) | |
parent | 658505d7a92f0518e1fc4c965bdaa389a6e83f2c (diff) | |
download | guix-c6d02bcf1bcc06c70e440221e317274926c0fce3.tar.gz |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/local.mk')
-rw-r--r-- | gnu/local.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index 3f48c466af..7347222852 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -256,7 +256,6 @@ GNU_SYSTEM_MODULES = \ %D%/packages/haskell-crypto.scm \ %D%/packages/haskell-web.scm \ %D%/packages/haskell-xyz.scm \ - %D%/packages/ham-radio.scm \ %D%/packages/hexedit.scm \ %D%/packages/hugs.scm \ %D%/packages/hurd.scm \ @@ -435,6 +434,7 @@ GNU_SYSTEM_MODULES = \ %D%/packages/toys.scm \ %D%/packages/tryton.scm \ %D%/packages/qt.scm \ + %D%/packages/radio.scm \ %D%/packages/ragel.scm \ %D%/packages/rails.scm \ %D%/packages/ratpoison.scm \ @@ -463,7 +463,6 @@ GNU_SYSTEM_MODULES = \ %D%/packages/scsi.scm \ %D%/packages/sdcc.scm \ %D%/packages/sdl.scm \ - %D%/packages/sdr.scm \ %D%/packages/search.scm \ %D%/packages/security-token.scm \ %D%/packages/selinux.scm \ @@ -832,6 +831,7 @@ dist_patch_DATA = \ %D%/packages/patches/date-output-pkg-config-files.patch \ %D%/packages/patches/darkice-workaround-fpermissive-error.patch \ %D%/packages/patches/datefudge-gettimeofday.patch \ + %D%/packages/patches/dbacl-include-locale.h.patch \ %D%/packages/patches/dbus-helper-search-path.patch \ %D%/packages/patches/dbus-c++-gcc-compat.patch \ %D%/packages/patches/dbus-c++-threading-mutex.patch \ |