[nongnu] elpa/nix-mode aef98227cc 419/500: Merge branch 'master' into derived-nix-drv-mode

[ELPA Syncer]

branch: elpa/nix-mode
commit aef98227cc32f70f02dd5fb796f507c6f85627f2
Merge: cc60a0d027 53ea839a52
Author: Matthew Bauer <mjbauer95@gmail.com>
Commit: Matthew Bauer <mjbauer95@gmail.com>

    Merge branch 'master' into derived-nix-drv-mode
---
 CHANGELOG.md    | 4 ++++
 Cask            | 2 --
 flake.nix       | 1 -
 nix-drv-mode.el | 4 ++--
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3e77ed9463..bda4dc2512 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## Unreleased
+
+* Removed json-mode dependency, using js instead.
+
 ## 1.4.5
 
 * Fixed completion support in nix-repl-mode for Nix 2.
diff --git a/Cask b/Cask
index 31fd291e74..0a1ae1d212 100644
--- a/Cask
+++ b/Cask
@@ -22,5 +22,3 @@
 
 (development
  (depends-on "ert"))
-
-(depends-on "json-mode")
diff --git a/flake.nix b/flake.nix
index f3a0804089..f9c1ef0fee 100644
--- a/flake.nix
+++ b/flake.nix
@@ -12,7 +12,6 @@
         emacs = emacsWithPackages (epkgs: with epkgs; [
           org-plus-contrib
           company
-          json-mode
           mmm-mode
         ]);
       in stdenvNoCC.mkDerivation {
diff --git a/nix-drv-mode.el b/nix-drv-mode.el
index 480f19c939..b8e9f1896c 100644
--- a/nix-drv-mode.el
+++ b/nix-drv-mode.el
@@ -16,11 +16,11 @@
 
 ;;; Code:
 
-(require 'javascript-mode)
+(require 'js)
 (require 'nix)
 
 ;;;###autoload
-(define-derived-mode nix-drv-mode javascript-mode "Nix-Derivation"
+(define-derived-mode nix-drv-mode js-mode "Nix-Derivation"
   "Pretty print Nix’s .drv files."
   (let ((inhibit-read-only t))
     (erase-buffer)