[org] Fix installation from nongnu elpa and double ownership of org

.lock

@@ -11,11 +11,12 @@
       `(("melpa"    . "melpa.org/packages/")
         ("org"      . "orgmode.org/elpa/")
         ("gnu"      . "elpa.gnu.org/packages/")
+        ("nongnu"   . "elpa.nongnu.org/nongnu/")
         ("spacelpa" . ,(concat configuration-layer-stable-elpa-archive "/packages/"))))
 
 (setq package-archive-priorities
       '(("spacelpa" . 8)
         ("melpa"    . 4)
-        ("org"      . 2)
+        ("org"      . 3)
+        ("nongnu"   . 2)
         ("gnu"      . 1)))
-

layers/+spacemacs/spacemacs-org/packages.el

@@ -33,7 +33,6 @@
     ;; layer. So it is easier for users to steal the ownership of the
     ;; `org' package.
     (default-org-config :location built-in)
-    (org :step pre)
     org-superstar
     (space-doc :location local)
     toc-org
@@ -42,9 +41,6 @@
 (defun spacemacs-org/post-init-flyspell ()
   (spell-checking/add-flyspell-hook 'org-mode-hook))
 
-;; dummy init function to force installation of `org'
-(defun spacemacs-org/init-org ())
-
 (defun spacemacs-org/init-default-org-config ()
   (use-package org
     :commands (org-clock-out org-occur-in-agenda-files org-agenda-files)