diff options
Diffstat (limited to 'pkgs/top-level')
-rw-r--r-- | pkgs/top-level/aliases.nix | 4 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 25 |
2 files changed, 17 insertions, 12 deletions
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 91e1927e77f8..efb36ab935f9 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -755,8 +755,8 @@ mapAliases ({ rocm-comgr = throw "'rocm-comgr' has been replaced with 'rocmPackages.rocm-comgr'"; # Added 2023-10-08 rocm-core = throw "'rocm-core' has been replaced with 'rocmPackages.rocm-core'"; # Added 2023-10-08 rocm-device-libs = throw "'rccl' has been replaced with 'rocmPackages.rocm-device-libs'"; # Added 2023-10-08 - rocm-opencl-icd = lib.warn "'rocm-opencl-icd' has been replaced with 'rocmPackages.clr.icd'" rocmPackages.clr.icd; # Added 2023-10-08 - rocm-opencl-runtime = lib.warn "'rocm-opencl-runtime' has been replaced with 'rocmPackages.clr'" rocmPackages.clr; # Added 2023-10-08 + rocm-opencl-icd = rocmPackages.clr.icd; # Added 2023-10-08 Convert to throw after 23.11 is released + rocm-opencl-runtime = rocmPackages.clr; # Added 2023-10-08 Convert to throw after 23.11 is released rocm-runtime = throw "'rocm-runtime' has been replaced with 'rocmPackages.rocm-runtime'"; # Added 2023-10-08 rocm-smi = throw "'rocm-smi' has been replaced with 'rocmPackages.rocm-smi'"; # Added 2023-10-08 rocm-thunk = throw "'rocm-thunk' has been replaced with 'rocmPackages.rocm-thunk'"; # Added 2023-10-08 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b8828cf3b2ed..eecc26f31dbe 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2736,9 +2736,10 @@ with pkgs; pcsxr = callPackage ../applications/emulators/pcsxr { }; - ppsspp = callPackage ../applications/emulators/ppsspp { }; - - ppsspp-sdl = ppsspp; + ppsspp-sdl = ppsspp.override { + enableQt = false; + enableVulkan = true; + }; ppsspp-sdl-wayland = ppsspp.override { forceWayland = true; @@ -11164,12 +11165,9 @@ with pkgs; grocy = callPackage ../servers/grocy { }; inherit (callPackage ../servers/nextcloud {}) - nextcloud24 nextcloud25 nextcloud26 nextcloud27; + nextcloud25 nextcloud26 nextcloud27; - nextcloud24Packages = throw "Nextcloud24 is EOL!"; - nextcloud25Packages = callPackage ../servers/nextcloud/packages { - apps = lib.importJSON ../servers/nextcloud/packages/25.json; - }; + nextcloud25Packages = throw "Nextcloud25 is EOL!"; nextcloud26Packages = callPackage ../servers/nextcloud/packages { apps = lib.importJSON ../servers/nextcloud/packages/26.json; }; @@ -18022,6 +18020,8 @@ with pkgs; bundler-audit = callPackage ../tools/security/bundler-audit { }; + sol2 = callPackage ../development/libraries/sol2 { }; + solargraph = rubyPackages.solargraph; rbenv = callPackage ../development/ruby-modules/rbenv { }; @@ -18966,7 +18966,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; - devbox = callPackage ../development/tools/devbox { }; + devbox = callPackage ../development/tools/devbox { buildGoModule = buildGo121Module; }; libcxx = llvmPackages.libcxx; libcxxabi = llvmPackages.libcxxabi; @@ -19649,7 +19649,10 @@ with pkgs; modd = callPackage ../development/tools/modd { }; - mold = callPackage ../development/tools/mold { }; + mold = callPackage ../development/tools/mold { + stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.llvmPackages_13.stdenv else stdenv; + tbb = tbb_2021_8; + }; mold-wrapped = wrapBintoolsWith { bintools = mold; @@ -34257,6 +34260,8 @@ with pkgs; synfigstudio = callPackage ../applications/graphics/synfigstudio { }; + typora = callPackage ../applications/editors/typora { }; + taxi = callPackage ../applications/networking/ftp/taxi { }; taxi-cli = with python3Packages; toPythonApplication taxi; |