public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into staging-next

Browse Source 
Conflicts:
 pkgs/shells/ion/default.nix
 pkgs/tools/misc/cicero-tui/default.nix
This commit is contained in:
Jonathan Ringer
2021-05-20 22:11:42 -07:00
parent 34a05e29f1 788deaad9d
commit 6b15fdce86
79 changed files with 17575 additions and 547 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/top-level/all-packages.nix
+8
View File
@@ -2782,6 +2782,8 @@ in
jellyfin-mpv-shim = python3Packages.callPackage ../applications/video/jellyfin-mpv-shim { };
jellyfin-web = callPackage ../servers/jellyfin/web.nix { };
jiten = callPackage ../applications/misc/jiten { };
jotta-cli = callPackage ../applications/misc/jotta-cli { };
@@ -3097,6 +3099,8 @@ in
socklog = callPackage ../tools/system/socklog { };
soju = callPackage ../applications/networking/soju { };
spacevim = callPackage ../applications/editors/spacevim { };
ssmsh = callPackage ../tools/admin/ssmsh { };
@@ -4887,6 +4891,8 @@ in
ghorg = callPackage ../applications/version-management/git-and-tools/ghorg { };
ghostunnel = callPackage ../tools/networking/ghostunnel { };
ghq = callPackage ../applications/version-management/git-and-tools/ghq { };
ghr = callPackage ../applications/version-management/git-and-tools/ghr { };
@@ -10258,6 +10264,8 @@ in
ats = callPackage ../development/compilers/ats { };
ats2 = callPackage ../development/compilers/ats2 { };
ats-acc = callPackage ../development/tools/ats-acc { };
avra = callPackage ../development/compilers/avra { };
bigloo = callPackage ../development/compilers/bigloo { };