diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-01-02 12:24:09 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-02 12:24:09 +0000 |
| commit | ec161d2240242c215d8280b00aa82f7e3f95d64e (patch) | |
| tree | 32001499525f4a7405958084db302aa141925c50 /pkgs/top-level | |
| parent | 6221782074b04dfe57322b0740883d35cb042615 (diff) | |
| parent | 0224ebfc4cdeac3b4f6c9b813dbce5511221a74a (diff) | |
Merge master into staging-next
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 3 | ||||
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b35bf893e02ef..9594ea710e5c1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26422,6 +26422,7 @@ in space-orbit = callPackage ../games/space-orbit { }; spring = callPackage ../games/spring { + asciidoc = asciidoc-full; boost = boost155; }; @@ -26797,6 +26798,8 @@ in let mkPlasma5 = import ../desktops/plasma-5; attrs = { + # ATTN: The Qt version used in the NixOS Plasma module must be updated + # whenever this changes! inherit libsForQt5; inherit lib fetchurl; gconf = gnome2.GConf; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a53b50146fecb..47eb3643f61a6 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2797,6 +2797,8 @@ in { hocr-tools = callPackage ../development/python-modules/hocr-tools { }; + hole = callPackage ../development/python-modules/hole { }; + holidays = callPackage ../development/python-modules/holidays { }; holoviews = callPackage ../development/python-modules/holoviews { }; |