diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2019-01-03 20:07:35 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-01-03 20:07:35 +0100 |
| commit | 2da31b80bb53000476b0a5ddcf7d76a44a15bfe4 (patch) | |
| tree | 9ac0bebed906a14b77141b3450e81681602b95e7 /pkgs/top-level | |
| parent | 092e3b50a8ff501a6ad1caf20165d2284d1ad5cb (diff) | |
| parent | 4b5b8850d81e11cb81855dbe58f4ce789d9e3893 (diff) | |
| download | nixlib-2da31b80bb53000476b0a5ddcf7d76a44a15bfe4.tar nixlib-2da31b80bb53000476b0a5ddcf7d76a44a15bfe4.tar.gz nixlib-2da31b80bb53000476b0a5ddcf7d76a44a15bfe4.tar.bz2 nixlib-2da31b80bb53000476b0a5ddcf7d76a44a15bfe4.tar.lz nixlib-2da31b80bb53000476b0a5ddcf7d76a44a15bfe4.tar.xz nixlib-2da31b80bb53000476b0a5ddcf7d76a44a15bfe4.tar.zst nixlib-2da31b80bb53000476b0a5ddcf7d76a44a15bfe4.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 11 | ||||
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 2 |
2 files changed, 10 insertions, 3 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 57bb5dc59039..316f6fbad72e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12496,6 +12496,7 @@ in sfml = callPackage ../development/libraries/sfml { inherit (darwin.apple_sdk.frameworks) IOKit Foundation AppKit OpenAL; + inherit (darwin) cf-private; }; csfml = callPackage ../development/libraries/csfml { }; @@ -15648,12 +15649,14 @@ in mobile-broadband-provider-info = callPackage ../data/misc/mobile-broadband-provider-info { }; + mojave-gtk-theme = callPackage ../data/themes/mojave { }; + + moka-icon-theme = callPackage ../data/icons/moka-icon-theme { }; + monoid = callPackage ../data/fonts/monoid { }; mononoki = callPackage ../data/fonts/mononoki { }; - moka-icon-theme = callPackage ../data/icons/moka-icon-theme { }; - montserrat = callPackage ../data/fonts/montserrat { }; mph_2b_damase = callPackage ../data/fonts/mph-2b-damase { }; @@ -20212,7 +20215,7 @@ in xpointerbarrier = callPackage ../tools/X11/xpointerbarrier {}; - xkb_switch = callPackage ../tools/X11/xkb-switch { }; + xkb-switch = callPackage ../tools/X11/xkb-switch { }; xkblayout-state = callPackage ../applications/misc/xkblayout-state { }; @@ -22921,6 +22924,8 @@ in webfs = callPackage ../servers/http/webfs { }; + websocketd = callPackage ../applications/networking/websocketd { }; + wikicurses = callPackage ../applications/misc/wikicurses { pythonPackages = python3Packages; }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c30cb0f752a8..46c50dce9e0e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5151,6 +5151,8 @@ in { pytado = callPackage ../development/python-modules/pytado { }; + casttube = callPackage ../development/python-modules/casttube { }; + }); in fix' (extends overrides packages) |