diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-01-25 00:13:57 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-01-25 00:13:57 +0000 |
commit | f22d2b21d89e8faec12d73838c9b87e95fdda8fc (patch) | |
tree | bd63d7dd3feeaef01c5c08e53129697be5b85aea /pkgs/top-level | |
parent | a67028b84298b2cebf715be41c3667bb8dca202d (diff) | |
parent | 5b0130945a3105b31a9209a2656f2b9d5e0c23a4 (diff) |
Merge master into haskell-updates
Diffstat (limited to 'pkgs/top-level')
-rw-r--r-- | pkgs/top-level/all-packages.nix | 48 | ||||
-rw-r--r-- | pkgs/top-level/nim-packages.nix | 2 | ||||
-rw-r--r-- | pkgs/top-level/python-packages.nix | 3 | ||||
-rw-r--r-- | pkgs/top-level/qt6-packages.nix | 3 |
4 files changed, 45 insertions, 11 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d38e73927d10d..78d351f346e23 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -657,12 +657,10 @@ with pkgs; dotnet-sdk_7 = dotnetCorePackages.sdk_7_0; dotnet-runtime_3 = dotnetCorePackages.runtime_3_1; - dotnet-runtime_5 = dotnetCorePackages.runtime_5_0; dotnet-runtime_6 = dotnetCorePackages.runtime_6_0; dotnet-runtime_7 = dotnetCorePackages.runtime_7_0; dotnet-aspnetcore_3 = dotnetCorePackages.aspnetcore_3_1; - dotnet-aspnetcore_5 = dotnetCorePackages.aspnetcore_5_0; dotnet-aspnetcore_6 = dotnetCorePackages.aspnetcore_6_0; dotnet-aspnetcore_7 = dotnetCorePackages.aspnetcore_7_0; @@ -2196,6 +2194,7 @@ with pkgs; zesarux = callPackage ../applications/emulators/zesarux { }; zsnes = pkgsi686Linux.callPackage ../applications/emulators/zsnes { }; + zsnes2 = pkgsi686Linux.callPackage ../applications/emulators/zsnes/2.x.nix { }; ### APPLICATIONS/EMULATORS/BSNES @@ -2319,6 +2318,8 @@ with pkgs; portfolio-filemanager = callPackage ../applications/file-managers/portfolio-filemanager { }; + potreeconverter = callPackage ../applications/graphics/potreeconverter { }; + ranger = callPackage ../applications/file-managers/ranger { }; sfm = callPackage ../applications/file-managers/sfm { }; @@ -3167,9 +3168,7 @@ with pkgs; gmni = callPackage ../applications/networking/browsers/gmni { }; - gmnisrv = callPackage ../servers/gemini/gmnisrv { - openssl = openssl_1_1; - }; + gmnisrv = callPackage ../servers/gemini/gmnisrv { }; gmnitohtml = callPackage ../applications/misc/gmnitohtml { }; @@ -3366,7 +3365,7 @@ with pkgs; kjv = callPackage ../applications/misc/kjv { }; - lukesmithxyz-bible-kjv = callPackage ../applications/misc/lukesmithxyz-bible/kjv.nix { }; + lukesmithxyz-bible-kjv = callPackage ../applications/misc/kjv/lukesmithxyz-kjv.nix { }; luigi = callPackage ../applications/networking/cluster/luigi { }; @@ -10301,7 +10300,9 @@ with pkgs; openimagedenoise_1_2_x = callPackage ../development/libraries/openimagedenoise/1_2_x.nix { }; - openmvg = callPackage ../applications/science/misc/openmvg { }; + openmvg = callPackage ../applications/science/misc/openmvg { + inherit (llvmPackages) openmp; + }; openmvs = callPackage ../applications/science/misc/openmvs { }; @@ -17265,6 +17266,8 @@ with pkgs; cloudcompare = libsForQt5.callPackage ../applications/graphics/cloudcompare { }; + cloudlog = callPackage ../applications/radio/cloudlog { }; + cloudflare-warp = callPackage ../tools/networking/cloudflare-warp { }; cloudfoundry-cli = callPackage ../applications/networking/cluster/cloudfoundry-cli { }; @@ -20659,6 +20662,12 @@ with pkgs; libcutl = callPackage ../development/libraries/libcutl { }; + libcxxrt = callPackage ../development/libraries/libcxxrt { + stdenv = if stdenv.hostPlatform.useLLVM or false + then overrideCC stdenv buildPackages.llvmPackages.tools.clangNoLibcxx + else stdenv; + }; + libdaemon = callPackage ../development/libraries/libdaemon { }; libdatovka = callPackage ../development/libraries/libdatovka { }; @@ -21555,6 +21564,8 @@ with pkgs; libtsm = callPackage ../development/libraries/libtsm { }; + libsv = callPackage ../development/libraries/libsv { }; + libgeotiff = callPackage ../development/libraries/libgeotiff { }; libu2f-host = callPackage ../development/libraries/libu2f-host { }; @@ -22639,6 +22650,7 @@ with pkgs; qt6Packages = recurseIntoAttrs (import ./qt6-packages.nix { inherit lib pkgs qt6; + stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv; }); quark-engine = callPackage ../tools/security/quark-engine { }; @@ -26835,6 +26847,8 @@ with pkgs; dosemu_fonts = callPackage ../data/fonts/dosemu-fonts { }; + dotcolon-fonts = callPackage ../data/fonts/dotcolon-fonts { }; + e17gtk = callPackage ../data/themes/e17gtk { }; eb-garamond = callPackage ../data/fonts/eb-garamond { }; @@ -26855,6 +26869,10 @@ with pkgs; eunomia = callPackage ../data/fonts/eunomia { }; + fa_1 = callPackage ../data/fonts/fa_1 { }; + + f1_8 = callPackage ../data/fonts/f1_8 { }; + f5_6 = callPackage ../data/fonts/f5_6 { }; faba-icon-theme = callPackage ../data/icons/faba-icon-theme { }; @@ -27192,6 +27210,8 @@ with pkgs; medio = callPackage ../data/fonts/medio { }; + melete = callPackage ../data/fonts/melete { }; + mno16 = callPackage ../data/fonts/mno16 { }; mnist = callPackage ../data/machine-learning/mnist { }; @@ -27228,6 +27248,8 @@ with pkgs; myrica = callPackage ../data/fonts/myrica { }; + nacelle = callPackage ../data/fonts/nacelle { }; + nafees = callPackage ../data/fonts/nafees { }; nanum = callPackage ../data/fonts/nanum { }; @@ -31106,6 +31128,8 @@ with pkgs; pragha = libsForQt5.callPackage ../applications/audio/pragha { }; + river-tag-overlay = callPackage ../applications/misc/river-tag-overlay { }; + rofi-mpd = callPackage ../applications/audio/rofi-mpd { }; rofi-bluetooth = callPackage ../applications/misc/rofi-bluetooth { }; @@ -31972,6 +31996,10 @@ with pkgs; polymake = callPackage ../applications/science/math/polymake { }; + pomodoro = callPackage ../applications/misc/pomodoro { + inherit (darwin.apple_sdk.frameworks) Foundation; + }; + pomotroid = callPackage ../applications/misc/pomotroid { electron = electron_9; }; @@ -32410,6 +32438,8 @@ with pkgs; secretscanner = callPackage ../tools/security/secretscanner { }; + setconf = python3.pkgs.callPackage ../tools/misc/setconf { }; + semiphemeral = callPackage ../tools/misc/semiphemeral { }; semver = callPackage ../applications/misc/semver { }; @@ -34316,7 +34346,7 @@ with pkgs; openethereum = callPackage ../applications/blockchains/openethereum { }; polkadot = callPackage ../applications/blockchains/polkadot { - inherit (darwin.apple_sdk.frameworks) Security; + inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; }; particl-core = callPackage ../applications/blockchains/particl-core { }; @@ -38715,6 +38745,8 @@ with pkgs; tuner = callPackage ../applications/audio/tuner { }; + locate-dominating-file = callPackage ../tools/misc/locate-dominating-file { }; + jfrog-cli = callPackage ../tools/misc/jfrog-cli { }; ov = callPackage ../tools/text/ov { }; diff --git a/pkgs/top-level/nim-packages.nix b/pkgs/top-level/nim-packages.nix index ca52d7f52b566..67863c3ac06d2 100644 --- a/pkgs/top-level/nim-packages.nix +++ b/pkgs/top-level/nim-packages.nix @@ -14,6 +14,8 @@ lib.makeScope newScope (self: astpatternmatching = callPackage ../development/nim-packages/astpatternmatching { }; + asynctools = callPackage ../development/nim-packages/asynctools { }; + base32 = callPackage ../development/nim-packages/base32 { }; bumpy = callPackage ../development/nim-packages/bumpy { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e21a89c4d8bf8..b8c5b329e45fd 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4803,9 +4803,6 @@ self: super: with self; { jaxlib-build = callPackage ../development/python-modules/jaxlib rec { inherit (pkgs.darwin) cctools; - buildBazelPackage = pkgs.buildBazelPackage.override { - stdenv = if stdenv.isDarwin then pkgs.darwin.apple_sdk_11_0.stdenv else stdenv; - }; # Some platforms don't have `cudaSupport` defined, hence the need for 'or false'. cudaSupport = pkgs.config.cudaSupport or false; IOKit = pkgs.darwin.apple_sdk_11_0.IOKit; diff --git a/pkgs/top-level/qt6-packages.nix b/pkgs/top-level/qt6-packages.nix index e566a8af758c1..9d6a58cb3b524 100644 --- a/pkgs/top-level/qt6-packages.nix +++ b/pkgs/top-level/qt6-packages.nix @@ -7,6 +7,7 @@ { lib , pkgs , qt6 +, stdenv }: (lib.makeScope pkgs.newScope ( self: @@ -24,6 +25,8 @@ let in (qt6 // { + inherit stdenv; + # LIBRARIES inherit (kdeFrameworks) kcoreaddons; |