about summary refs log tree commit diff
path: root/pkgs/top-level/all-packages.nix
diff options
context:
space:
mode:
authorworldofpeace <worldofpeace@users.noreply.github.com>2019-04-24 09:21:07 -0400
committerGitHub <noreply@github.com>2019-04-24 09:21:07 -0400
commitf5d3418b0ce1f12cba7155f726d1f5d37bf46a35 (patch)
treea407d9866e7db358950bf938fd9e7321f6445e64 /pkgs/top-level/all-packages.nix
parent65a963235c97ca91260742d35b8b40e1544e33bd (diff)
parent148119b9a6636a4fdfbdc1cc0dcbf268d523008d (diff)
downloadnixlib-f5d3418b0ce1f12cba7155f726d1f5d37bf46a35.tar
nixlib-f5d3418b0ce1f12cba7155f726d1f5d37bf46a35.tar.gz
nixlib-f5d3418b0ce1f12cba7155f726d1f5d37bf46a35.tar.bz2
nixlib-f5d3418b0ce1f12cba7155f726d1f5d37bf46a35.tar.lz
nixlib-f5d3418b0ce1f12cba7155f726d1f5d37bf46a35.tar.xz
nixlib-f5d3418b0ce1f12cba7155f726d1f5d37bf46a35.tar.zst
nixlib-f5d3418b0ce1f12cba7155f726d1f5d37bf46a35.zip
Merge pull request #58994 from zookatron/sublime-merge
sublime-merge: init at 1107
Diffstat (limited to 'pkgs/top-level/all-packages.nix')
-rw-r--r--pkgs/top-level/all-packages.nix4
1 files changed, 4 insertions, 0 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2fa66be2dcd7..3f3581e1b635 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19913,6 +19913,10 @@ in
 
   sublime3-dev = sublime3Packages.sublime3-dev;
 
+  inherit (callPackage ../applications/version-management/sublime-merge {})
+    sublime-merge
+    sublime-merge-dev;
+
   inherit (callPackages ../applications/version-management/subversion { sasl = cyrus_sasl; })
     subversion18 subversion19 subversion_1_10 subversion_1_11;