diff options
Diffstat (limited to 'pkgs/top-level')
-rw-r--r-- | pkgs/top-level/aliases.nix | 2 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 27 | ||||
-rw-r--r-- | pkgs/top-level/haskell-packages.nix | 15 | ||||
-rw-r--r-- | pkgs/top-level/python-packages.nix | 10 |
4 files changed, 46 insertions, 8 deletions
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 77ca1204bf41..f4fb2110f1dc 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -846,7 +846,7 @@ mapAliases ({ todolist = throw "todolist is now ultralist."; # added 2020-12-27 - /* Cleanup before 21.03 */ + /* Cleanup before 21.05 */ riot-desktop = throw "riot-desktop is now element-desktop!"; riot-web = throw "riot-web is now element-web"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7fbc6cd0e658..b7ff2d80f58d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1335,7 +1335,9 @@ in gremlin-console = callPackage ../applications/misc/gremlin-console { }; - grex = callPackage ../tools/misc/grex { }; + grex = callPackage ../tools/misc/grex { + inherit (darwin.apple_sdk.frameworks) Security; + }; gcsfuse = callPackage ../tools/filesystems/gcsfuse { }; @@ -3994,7 +3996,9 @@ in eva = callPackage ../tools/misc/eva { }; - exa = callPackage ../tools/misc/exa { }; + exa = callPackage ../tools/misc/exa { + inherit (darwin.apple_sdk.frameworks) Security; + }; exempi = callPackage ../development/libraries/exempi { stdenv = if stdenv.isi686 then gcc6Stdenv else stdenv; @@ -8381,7 +8385,9 @@ in toilet = callPackage ../tools/misc/toilet { }; - tokei = callPackage ../development/tools/misc/tokei { }; + tokei = callPackage ../development/tools/misc/tokei { + inherit (darwin.apple_sdk.frameworks) Security; + }; toml2nix = (callPackage ../tools/toml2nix { }).toml2nix { }; @@ -8431,6 +8437,8 @@ in trezor_agent = with python3Packages; toPythonApplication trezor_agent; + trezor-suite = callPackage ../applications/blockchains/trezor-suite { }; + tthsum = callPackage ../applications/misc/tthsum { }; chaps = callPackage ../tools/security/chaps { }; @@ -10059,7 +10067,7 @@ in # Please update doc/languages-frameworks/haskell.section.md, “Our # current default compiler is”, if you bump this: - haskellPackages = dontRecurseIntoAttrs haskell.packages.ghc8103; + haskellPackages = dontRecurseIntoAttrs haskell.packages.ghc8104; inherit (haskellPackages) ghc; @@ -10193,6 +10201,8 @@ in inherit (emacs.pkgs.melpaStablePackages) irony; }; + holo-build = callPackage ../tools/package-management/holo-build { }; + hugs = callPackage ../development/interpreters/hugs { }; openjfx11 = callPackage ../development/compilers/openjdk/openjfx/11.nix { }; @@ -10842,7 +10852,10 @@ in inherit (darwin.apple_sdk.frameworks) Security; }; - maturin = callPackage ../development/tools/rust/maturin { }; + maturin = callPackage ../development/tools/rust/maturin { + inherit (darwin.apple_sdk.frameworks) Security; + }; + inherit (rustPackages) rls; rustfmt = rustPackages.rustfmt; rustracer = callPackage ../development/tools/rust/racer { @@ -12656,7 +12669,7 @@ in pyrseas = callPackage ../development/tools/database/pyrseas { }; - qtcreator = libsForQt514.callPackage ../development/tools/qtcreator { }; + qtcreator = libsForQt5.callPackage ../development/tools/qtcreator { }; qxmledit = libsForQt5.callPackage ../applications/editors/qxmledit {} ; @@ -17894,6 +17907,8 @@ in mailman-web = with python3.pkgs; toPythonApplication mailman-web; + mastodon = callPackage ../servers/mastodon { }; + mattermost = callPackage ../servers/mattermost { }; matterircd = callPackage ../servers/mattermost/matterircd.nix { }; matterbridge = callPackage ../servers/matterbridge { }; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 46e222261fc8..6c8e3e7d855d 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -114,6 +114,16 @@ in { buildLlvmPackages = buildPackages.llvmPackages_9; llvmPackages = pkgs.llvmPackages_9; }; + ghc8104 = callPackage ../development/compilers/ghc/8.10.4.nix { + # aarch64 ghc865Binary gets SEGVs due to haskell#15449 or similar + bootPkgs = if stdenv.isAarch64 || stdenv.isAarch32 then + packages.ghc8102BinaryMinimal + else + packages.ghc865Binary; + inherit (buildPackages.python3Packages) sphinx; + buildLlvmPackages = buildPackages.llvmPackages_9; + llvmPackages = pkgs.llvmPackages_9; + }; ghc901 = callPackage ../development/compilers/ghc/9.0.1.nix { bootPkgs = packages.ghc8102Binary; inherit (buildPackages.python3Packages) sphinx; @@ -221,6 +231,11 @@ in { ghc = bh.compiler.ghc8103; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.10.x.nix { }; }; + ghc8104 = callPackage ../development/haskell-modules { + buildHaskellPackages = bh.packages.ghc8104; + ghc = bh.compiler.ghc8104; + compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.10.x.nix { }; + }; ghc901 = callPackage ../development/haskell-modules { buildHaskellPackages = bh.packages.ghc901; ghc = bh.compiler.ghc901; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 23dd4638b989..17f6624c42ea 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5199,6 +5199,8 @@ in { pyahocorasick = callPackage ../development/python-modules/pyahocorasick { }; + pyairnow = callPackage ../development/python-modules/pyairnow { }; + pyairvisual = callPackage ../development/python-modules/pyairvisual { }; pyalgotrade = callPackage ../development/python-modules/pyalgotrade { }; @@ -6534,6 +6536,8 @@ in { pyvera = callPackage ../development/python-modules/pyvera { }; + pyvesync = callPackage ../development/python-modules/pyvesync { }; + pyvex = callPackage ../development/python-modules/pyvex { }; pyviz-comms = callPackage ../development/python-modules/pyviz-comms { }; @@ -6598,6 +6602,8 @@ in { pyyaml = callPackage ../development/python-modules/pyyaml { }; + pyzerproc = callPackage ../development/python-modules/pyzerproc { }; + pyzmq = callPackage ../development/python-modules/pyzmq { }; pyzufall = callPackage ../development/python-modules/pyzufall { }; @@ -8483,7 +8489,9 @@ in { yowsup = callPackage ../development/python-modules/yowsup { }; - yq = callPackage ../development/python-modules/yq { }; + yq = callPackage ../development/python-modules/yq { + inherit (pkgs) jq; + }; yt = callPackage ../development/python-modules/yt { }; |