diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2019-06-11 10:27:09 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2019-06-11 10:27:09 +0200 |
| commit | 58bf51b4c0771fb6cfcf22be84d734096e7b11e0 (patch) | |
| tree | 69c22625468b10e43fd37e7c5ddc420a1de6ab55 /gnu/local.mk | |
| parent | 69ecd666d73ebc5ee7a0be54f4e24f000d1d7e31 (diff) | |
| parent | bf3005346e6538aba6d077c887f688779b94b274 (diff) | |
| download | guix-58bf51b4c0771fb6cfcf22be84d734096e7b11e0.tar guix-58bf51b4c0771fb6cfcf22be84d734096e7b11e0.tar.gz | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/local.mk')
| -rw-r--r-- | gnu/local.mk | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index 474f5163f9..49cb429ba9 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -17,7 +17,7 @@ # Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com> # Copyright © 2017, 2018 Gábor Boskovits <boskovits@gmail.com> # Copyright © 2018 Amirouche Boubekki <amirouche@hypermove.net> -# Copyright © 2018 Oleg Pykhalov <go.wigust@gmail.com> +# Copyright © 2018, 2019 Oleg Pykhalov <go.wigust@gmail.com> # Copyright © 2018 Stefan Stefanović <stefanx2ovic@gmail.com> # Copyright © 2018 Maxim Cournoyer <maxim.cournoyer@gmail.com> # @@ -526,6 +526,7 @@ GNU_SYSTEM_MODULES = \ %D%/services/messaging.scm \ %D%/services/monitoring.scm \ %D%/services/networking.scm \ + %D%/services/nix.scm \ %D%/services/nfs.scm \ %D%/services/security-token.scm \ %D%/services/shepherd.scm \ @@ -662,6 +663,7 @@ dist_patch_DATA = \ %D%/packages/patches/aegisub-icu59-include-unistr.patch \ %D%/packages/patches/aegisub-boost68.patch \ %D%/packages/patches/agg-am_c_prototype.patch \ + %D%/packages/patches/allegro-mesa-18.2.5-and-later.patch \ %D%/packages/patches/amule-crypto-6.patch \ %D%/packages/patches/antiword-CVE-2014-8123.patch \ %D%/packages/patches/antlr3-3_1-fix-java8-compilation.patch \ |