diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-11-09 00:02:40 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-09 00:02:40 +0000 |
| commit | 50249cdaf29f872fb960dc9110696d208a77fc3a (patch) | |
| tree | 3937101c388cdbd1a6fb29a6474b8d7f49797a43 /pkgs/top-level | |
| parent | b7714638480cbac3400a7848ad021409b41bf593 (diff) | |
| parent | 00a0662a3ca0e36397dcc5e3244a7286d46232d4 (diff) | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 6 | ||||
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1c6db17ccceb4..512ff5498f8d0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -33965,7 +33965,7 @@ with pkgs; wlroots = wlroots_0_15; }; - mpvScripts = import ../applications/video/mpv/scripts { inherit lib callPackage config; }; + mpvScripts = callPackage ../applications/video/mpv/scripts { }; open-in-mpv = callPackage ../applications/video/open-in-mpv { }; @@ -35892,7 +35892,9 @@ with pkgs; tofi = callPackage ../applications/misc/tofi { }; - tokyo-night-gtk = callPackage ../data/themes/tokyo-night-gtk { }; + tokyo-night-gtk = tokyo-night-gtk-variants.full; + + tokyo-night-gtk-variants = recurseIntoAttrs (callPackage ../data/themes/tokyo-night-gtk { }); topydo = callPackage ../applications/misc/topydo { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 586487072e00d..5f496c8896365 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1573,6 +1573,8 @@ self: super: with self; { enablePython = true; }); + bork = callPackage ../development/python-modules/bork { }; + boschshcpy = callPackage ../development/python-modules/boschshcpy { }; bottombar = callPackage ../development/python-modules/bottombar { }; @@ -15975,6 +15977,8 @@ self: super: with self; { zc_lockfile = callPackage ../development/python-modules/zc_lockfile { }; + zcbor = callPackage ../development/python-modules/zcbor { }; + zconfig = callPackage ../development/python-modules/zconfig { }; zcs = callPackage ../development/python-modules/zcs { }; |