summaryrefslogtreecommitdiff
path: root/gnu/local.mk
diff options
context:
space:
mode:
authorMarius Bakke <mbakke@fastmail.com>2018-12-23 23:26:04 +0100
committerMarius Bakke <mbakke@fastmail.com>2018-12-23 23:26:04 +0100
commit02bf685d00238f74d28211e71d22a03f58e962cd (patch)
tree00d0bc1ef3fd74b6dc5d3ce68cb24835bf07a91f /gnu/local.mk
parent472c36bd36696cfe744e8a7b8f4d4ac5800e0f68 (diff)
parent8f2253af7da1c537b4c11e6b43c8d0a9f026b609 (diff)
downloadguix-patches-02bf685d00238f74d28211e71d22a03f58e962cd.tar
guix-patches-02bf685d00238f74d28211e71d22a03f58e962cd.tar.gz
Merge branch 'master' into staging
Diffstat (limited to 'gnu/local.mk')
-rw-r--r--gnu/local.mk2
1 files changed, 0 insertions, 2 deletions
diff --git a/gnu/local.mk b/gnu/local.mk
index 3e205a8f0a..713050be72 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -109,7 +109,6 @@ GNU_SYSTEM_MODULES = \
%D%/packages/commencement.scm \
%D%/packages/compression.scm \
%D%/packages/compton.scm \
- %D%/packages/conkeror.scm \
%D%/packages/conky.scm \
%D%/packages/connman.scm \
%D%/packages/cook.scm \
@@ -648,7 +647,6 @@ dist_patch_DATA = \
%D%/packages/patches/cube-nocheck.patch \
%D%/packages/patches/cursynth-wave-rand.patch \
%D%/packages/patches/cvs-2017-12836.patch \
- %D%/packages/patches/datamash-arm-tests.patch \
%D%/packages/patches/dbus-helper-search-path.patch \
%D%/packages/patches/deja-dup-use-ref-keyword-for-iter.patch \
%D%/packages/patches/dfu-programmer-fix-libusb.patch \