diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2018-09-03 19:20:06 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2018-09-03 19:20:06 +0200 |
| commit | 70dc8db8e7a44e0357c6b0582a710a918bd2e353 (patch) | |
| tree | 083102cf532c523068f018e2b113947ca6a3db02 /gnu/local.mk | |
| parent | 279ed3efee9c71116d368163f805fe9494518687 (diff) | |
| parent | c702749dfd47ea6983768cd5b8cf828898445af0 (diff) | |
| download | guix-70dc8db8e7a44e0357c6b0582a710a918bd2e353.tar guix-70dc8db8e7a44e0357c6b0582a710a918bd2e353.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/local.mk')
| -rw-r--r-- | gnu/local.mk | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index 806a5f3c2a..21f0482847 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -213,6 +213,7 @@ GNU_SYSTEM_MODULES = \ %D%/packages/guile-wm.scm \ %D%/packages/gv.scm \ %D%/packages/gxmessage.scm \ + %D%/packages/hardware.scm \ %D%/packages/haskell.scm \ %D%/packages/haskell-check.scm \ %D%/packages/haskell-crypto.scm \ @@ -650,6 +651,7 @@ dist_patch_DATA = \ %D%/packages/patches/doc++-segfault-fix.patch \ %D%/packages/patches/dovecot-trees-support-dovecot-2.3.patch \ %D%/packages/patches/doxygen-test.patch \ + %D%/packages/patches/dropbear-CVE-2018-15599.patch \ %D%/packages/patches/dvd+rw-tools-add-include.patch \ %D%/packages/patches/elfutils-tests-ptrace.patch \ %D%/packages/patches/elogind-glibc-2.27.patch \ @@ -793,6 +795,8 @@ dist_patch_DATA = \ %D%/packages/patches/gtkglext-disable-disable-deprecated.patch \ %D%/packages/patches/gzdoom-search-in-installed-share.patch \ %D%/packages/patches/handbrake-pkg-config-path.patch \ + %D%/packages/patches/haskell-mode-unused-variables.patch \ + %D%/packages/patches/haskell-mode-make-check.patch \ %D%/packages/patches/hdf4-architectures.patch \ %D%/packages/patches/hdf4-reproducibility.patch \ %D%/packages/patches/hdf4-shared-fortran.patch \ @@ -999,7 +1003,6 @@ dist_patch_DATA = \ %D%/packages/patches/ola-readdir-r.patch \ %D%/packages/patches/openbabel-fix-crash-on-nwchem-output.patch \ %D%/packages/patches/opencascade-oce-glibc-2.26.patch \ - %D%/packages/patches/openexr-missing-samples.patch \ %D%/packages/patches/openfoam-4.1-cleanup.patch \ %D%/packages/patches/openldap-CVE-2017-9287.patch \ %D%/packages/patches/openocd-nrf52.patch \ @@ -1123,6 +1126,7 @@ dist_patch_DATA = \ %D%/packages/patches/ruby-concurrent-test-arm.patch \ %D%/packages/patches/ruby-rack-ignore-failing-test.patch \ %D%/packages/patches/ruby-tzinfo-data-ignore-broken-test.patch\ + %D%/packages/patches/rust-1.19-mrustc.patch \ %D%/packages/patches/rust-bootstrap-stage0-test.patch \ %D%/packages/patches/rust-coresimd-doctest.patch \ %D%/packages/patches/rxvt-unicode-escape-sequences.patch \ |