diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-12-01 18:01:03 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-01 18:01:03 +0000 |
| commit | b46f5c5c91b38a9488887bf5087e09fb69bc64b6 (patch) | |
| tree | 75317d59f5a982c9addda3c887f47c2b7679122e /pkgs/top-level | |
| parent | 9cca0e4288e48fa1e61dee5af425733afc4a882d (diff) | |
| parent | 786100e12d24e50888986a553a26a60bbd484f01 (diff) | |
| download | nixlib-b46f5c5c91b38a9488887bf5087e09fb69bc64b6.tar nixlib-b46f5c5c91b38a9488887bf5087e09fb69bc64b6.tar.gz nixlib-b46f5c5c91b38a9488887bf5087e09fb69bc64b6.tar.bz2 nixlib-b46f5c5c91b38a9488887bf5087e09fb69bc64b6.tar.lz nixlib-b46f5c5c91b38a9488887bf5087e09fb69bc64b6.tar.xz nixlib-b46f5c5c91b38a9488887bf5087e09fb69bc64b6.tar.zst nixlib-b46f5c5c91b38a9488887bf5087e09fb69bc64b6.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 10 | ||||
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7302b604c5e3..c1a80297a407 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2088,8 +2088,6 @@ with pkgs; transmission-rss = callPackage ../tools/networking/transmission-rss { }; - trigger-control = callPackage ../tools/games/trigger-control { }; - trimage = callPackage ../applications/graphics/trimage { inherit (qt5) wrapQtAppsHook; }; ttchat = callPackage ../tools/misc/ttchat { }; @@ -3594,8 +3592,6 @@ with pkgs; bunyan-rs = callPackage ../development/tools/bunyan-rs { }; - butt = callPackage ../applications/audio/butt { }; - calcure = callPackage ../applications/misc/calcure { }; callaudiod = callPackage ../applications/audio/callaudiod { }; @@ -18323,6 +18319,8 @@ with pkgs; emmet-ls = callPackage ../development/tools/language-servers/emmet-ls { }; + emmet-language-server = callPackage ../development/tools/language-servers/emmet-language-server { }; + fortls = python3.pkgs.callPackage ../development/tools/language-servers/fortls { }; fortran-language-server = python3.pkgs.callPackage ../development/tools/language-servers/fortran-language-server { }; @@ -30014,6 +30012,8 @@ with pkgs; quattrocento-sans = callPackage ../data/fonts/quattrocento-sans { }; + quivira = callPackage ../data/fonts/quivira { }; + raleway = callPackage ../data/fonts/raleway { }; recursive = callPackage ../data/fonts/recursive { }; @@ -41699,8 +41699,6 @@ with pkgs; snowsql = callPackage ../applications/misc/snowsql { }; - snowmachine = python3Packages.callPackage ../applications/misc/snowmachine { }; - sidequest = callPackage ../applications/misc/sidequest { }; maphosts = callPackage ../tools/networking/maphosts { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 07f44dcf96fd..4f319267cecf 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4496,6 +4496,8 @@ self: super: with self; { gitdb = callPackage ../development/python-modules/gitdb { }; + githubkit = callPackage ../development/python-modules/githubkit { }; + github-to-sqlite = callPackage ../development/python-modules/github-to-sqlite { }; github-webhook = callPackage ../development/python-modules/github-webhook { }; |