diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2021-11-23 11:22:30 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2021-11-23 11:29:38 +0100 |
| commit | b15e543d303ea58fdc0f0541c708389f9d513e3d (patch) | |
| tree | 5c4bd48d67d4d3cd4806269dcabf58382f448bed /gnu/local.mk | |
| parent | 4efc08d895274ee39e6e6e5c49121fb05a0281b6 (diff) | |
| parent | daf7b5ecef8de0e536ffd8d2957f022d010767a8 (diff) | |
| download | guix-patches-b15e543d303ea58fdc0f0541c708389f9d513e3d.tar guix-patches-b15e543d303ea58fdc0f0541c708389f9d513e3d.tar.gz | |
Merge branch 'master' into core-updates-frozen
Diffstat (limited to 'gnu/local.mk')
| -rw-r--r-- | gnu/local.mk | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index cf69842341..351c81bb3a 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -520,6 +520,7 @@ GNU_SYSTEM_MODULES = \ %D%/packages/sawfish.scm \ %D%/packages/scanner.scm \ %D%/packages/scheme.scm \ + %D%/packages/spreadsheet.scm \ %D%/packages/screen.scm \ %D%/packages/scribus.scm \ %D%/packages/scsi.scm \ @@ -587,7 +588,6 @@ GNU_SYSTEM_MODULES = \ %D%/packages/video.scm \ %D%/packages/vim.scm \ %D%/packages/virtualization.scm \ - %D%/packages/visidata.scm \ %D%/packages/vlang.scm \ %D%/packages/vnc.scm \ %D%/packages/vpn.scm \ @@ -1516,7 +1516,7 @@ dist_patch_DATA = \ %D%/packages/patches/ocaml-dose3-Install-mli-cmx-etc.patch \ %D%/packages/patches/ocaml-multiple-definitions.patch \ %D%/packages/patches/ocaml-4.09-multiple-definitions.patch \ - %D%/packages/patches/ocaml-ppx-variants-ppxlib-api-change.patch \ + %D%/packages/patches/ocaml-qcheck-fix-test-whitespace.patch \ %D%/packages/patches/omake-fix-non-determinism.patch \ %D%/packages/patches/oneko-remove-nonfree-characters.patch \ %D%/packages/patches/onnx-optimizer-system-library.patch \ @@ -1735,6 +1735,7 @@ dist_patch_DATA = \ %D%/packages/patches/rust-nettle-disable-vendor.patch \ %D%/packages/patches/rust-nettle-sys-disable-vendor.patch \ %D%/packages/patches/rust-openssl-sys-no-vendor.patch \ + %D%/packages/patches/rust-shell2batch-lint-fix.patch \ %D%/packages/patches/sbc-fix-build-non-x86.patch \ %D%/packages/patches/sbcl-burgled-batteries3-fix-signals.patch \ %D%/packages/patches/sbcl-clml-fix-types.patch \ |