diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2020-11-10 10:13:13 +0100 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-11-10 10:13:13 +0100 |
commit | 0b2ca377b16bde31fac432ef4ce457b01498464b (patch) | |
tree | a2649c7da28e984e3c9164100efd7f3028f9590e /pkgs/top-level | |
parent | 32fdf2118ce78744e30dd512c1d5a13ae2eb03f2 (diff) | |
parent | 379aaa1e0cb9ba38cf2071c049a7478adefb4827 (diff) |
Merge staging-next into staging
Diffstat (limited to 'pkgs/top-level')
-rw-r--r-- | pkgs/top-level/all-packages.nix | 27 | ||||
-rw-r--r-- | pkgs/top-level/python-packages.nix | 8 |
2 files changed, 22 insertions, 13 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8eae90ddc4c7..f7a035589206 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1064,6 +1064,8 @@ in cloud-custodian = python3Packages.callPackage ../tools/networking/cloud-custodian { }; + coconut = with python3Packages; toPythonApplication coconut; + cod = callPackage ../tools/misc/cod { }; codespell = with python3Packages; toPythonApplication codespell; @@ -2145,6 +2147,8 @@ in gdrive = callPackage ../applications/networking/gdrive { }; + go-chromecast = callPackage ../applications/video/go-chromecast { }; + go-rice = callPackage ../tools/misc/go.rice {}; go-2fa = callPackage ../tools/security/2fa {}; @@ -3357,7 +3361,9 @@ in dog = callPackage ../tools/system/dog { }; - dogdns = callPackage ../tools/networking/dogdns { }; + dogdns = callPackage ../tools/networking/dogdns { + inherit (darwin.apple_sdk.frameworks) Security; + }; dosfstools = callPackage ../tools/filesystems/dosfstools { }; @@ -3794,6 +3800,8 @@ in feedreader = callPackage ../applications/networking/feedreaders/feedreader {}; + fend = callPackage ../tools/misc/fend { }; + ferm = callPackage ../tools/networking/ferm { }; ffsend = callPackage ../tools/misc/ffsend { }; @@ -9627,7 +9635,7 @@ in stdenv = gcc7Stdenv; }); - llvmPackages_latest = llvmPackages_10; + llvmPackages_latest = llvmPackages_11; llvmPackages_rocm = callPackage ../development/compilers/llvm/rocm { }; @@ -15280,7 +15288,7 @@ in kde-cli-tools kde-gtk-config kdeplasma-addons kgamma5 kinfocenter kmenuedit kscreen kscreenlocker ksshaskpass ksysguard kwallet-pam kwayland-integration kwin kwrited milou oxygen plasma-browser-integration plasma-desktop - plasma-integration plasma-nm plasma-pa plasma-vault plasma-workspace + plasma-integration plasma-nm plasma-pa plasma-thunderbolt plasma-vault plasma-workspace plasma-workspace-wallpapers polkit-kde-agent powerdevil sddm-kcm systemsettings user-manager xdg-desktop-portal-kde ; @@ -18366,7 +18374,7 @@ in # Hardened Linux hardenedLinuxPackagesFor = kernel': overrides: let # Note: We use this hack since the hardened patches can lag behind and we don't want to delay updates: - linux_latest_for_hardened = pkgs.linux_5_8; + linux_latest_for_hardened = pkgs.linux_5_9; kernel = (if kernel' == pkgs.linux_latest then linux_latest_for_hardened else kernel').override overrides; in linuxPackagesFor (kernel.override { structuredExtraConfig = import ../os-specific/linux/kernel/hardened/config.nix { @@ -22691,6 +22699,7 @@ in pdfsam-basic = callPackage ../applications/misc/pdfsam-basic { }; mupdf = callPackage ../applications/misc/mupdf { }; + mupdf_1_17 = callPackage ../applications/misc/mupdf/1.17.nix { }; mystem = callPackage ../applications/misc/mystem { }; @@ -24345,6 +24354,7 @@ in windowlab = callPackage ../applications/window-managers/windowlab { }; windowmaker = callPackage ../applications/window-managers/windowmaker { }; + dockapps = callPackage ../applications/window-managers/windowmaker/dockapps { }; wily = callPackage ../applications/editors/wily { }; @@ -24354,16 +24364,8 @@ in write_stylus = libsForQt5.callPackage ../applications/graphics/write_stylus { }; - alsamixer.app = callPackage ../applications/window-managers/windowmaker/dockapps/alsamixer.app.nix { }; - wllvm = callPackage ../development/tools/wllvm { }; - wmcalclock = callPackage ../applications/window-managers/windowmaker/dockapps/wmcalclock.nix { }; - - wmsm.app = callPackage ../applications/window-managers/windowmaker/dockapps/wmsm.app.nix { }; - - wmsystemtray = callPackage ../applications/window-managers/windowmaker/dockapps/wmsystemtray.nix { }; - wmname = callPackage ../applications/misc/wmname { }; wmctrl = callPackage ../tools/X11/wmctrl { }; @@ -24914,7 +24916,6 @@ in exodus = callPackage ../applications/blockchains/exodus { }; - freicoin = callPackage ../applications/blockchains/freicoin.nix { boost = boost155; }; go-ethereum = callPackage ../applications/blockchains/go-ethereum.nix { inherit (darwin) libobjc; inherit (darwin.apple_sdk.frameworks) IOKit; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 95d887d3bc69..06bd9f226e7e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1250,6 +1250,8 @@ in { cnvkit = callPackage ../development/python-modules/cnvkit { }; + coconut = callPackage ../development/python-modules/coconut { }; + cocotb = callPackage ../development/python-modules/cocotb { }; codecov = callPackage ../development/python-modules/codecov { }; @@ -1351,6 +1353,8 @@ in { cppy = callPackage ../development/python-modules/cppy { }; + cpyparsing = callPackage ../development/python-modules/cpyparsing { }; + cram = callPackage ../development/python-modules/cram { }; crashtest = callPackage ../development/python-modules/crashtest { }; @@ -2530,6 +2534,8 @@ in { google-i18n-address = callPackage ../development/python-modules/google-i18n-address { }; + googlemaps = callPackage ../development/python-modules/googlemaps { }; + google-music = callPackage ../development/python-modules/google-music { }; google-music-proto = callPackage ../development/python-modules/google-music-proto { }; @@ -4245,6 +4251,8 @@ in { openrazer-daemon = callPackage ../development/python-modules/openrazer/daemon.nix { }; + openrouteservice = callPackage ../development/python-modules/openrouteservice/default.nix { }; + opentimestamps = callPackage ../development/python-modules/opentimestamps { }; opentracing = callPackage ../development/python-modules/opentracing { }; |