diff options
Diffstat (limited to 'pkgs/top-level/all-packages.nix')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 73 |
1 files changed, 33 insertions, 40 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 80b6ef933604c..af563c7ed52f4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1434,13 +1434,18 @@ with pkgs; name = "find-xml-catalogs-hook"; } ../build-support/setup-hooks/find-xml-catalogs.sh; - wrapGAppsHook = callPackage ../build-support/setup-hooks/wrap-gapps-hook { - makeWrapper = makeBinaryWrapper; + wrapGAppsHook3 = wrapGAppsNoGuiHook.override { + isGraphical = true; }; - wrapGAppsHook4 = wrapGAppsHook.override { gtk3 = __splicedPackages.gtk4; }; + wrapGAppsHook4 = wrapGAppsNoGuiHook.override { + isGraphical = true; + gtk3 = __splicedPackages.gtk4; + }; - wrapGAppsNoGuiHook = wrapGAppsHook.override { isGraphical = false; }; + wrapGAppsNoGuiHook = callPackage ../build-support/setup-hooks/wrap-gapps-hook { + makeWrapper = makeBinaryWrapper; + }; separateDebugInfo = makeSetupHook { name = "separate-debug-info-hook"; @@ -4426,8 +4431,6 @@ with pkgs; bundletool = callPackage ../development/tools/bundletool { }; - bustle = haskellPackages.bustle; - bwm_ng = callPackage ../tools/networking/bwm-ng { }; bwbasic = callPackage ../development/interpreters/bwbasic { }; @@ -18642,15 +18645,7 @@ with pkgs; doclifter = callPackage ../development/tools/misc/doclifter { }; - docutils = with python3Packages; toPythonApplication ( - docutils.overridePythonAttrs (attrs: rec { - version = "0.20.1"; - src = attrs.src.override { - inherit version; - hash = "sha256-8IpOJ2w6FYOobc4+NKuj/gTQK7ot1R7RYQYkToqSPjs="; - }; - }) - ); + docutils = with python3Packages; toPythonApplication docutils; doctl = callPackage ../development/tools/doctl { }; @@ -24998,7 +24993,7 @@ with pkgs; whereami = callPackage ../development/libraries/whereami { }; wildmidi = callPackage ../development/libraries/wildmidi { - inherit (darwin.apple_sdk.frameworks) OpenAL; + inherit (darwin.apple_sdk.frameworks) OpenAL CoreAudioKit; }; wiredtiger = callPackage ../development/libraries/wiredtiger { }; @@ -25432,17 +25427,17 @@ with pkgs; }; # Steel Bank Common Lisp - sbcl_2_4_2 = wrapLisp { - pkg = callPackage ../development/compilers/sbcl { version = "2.4.2"; }; + sbcl_2_4_3 = wrapLisp { + pkg = callPackage ../development/compilers/sbcl { version = "2.4.3"; }; faslExt = "fasl"; flags = [ "--dynamic-space-size" "3000" ]; }; - sbcl_2_4_3 = wrapLisp { - pkg = callPackage ../development/compilers/sbcl { version = "2.4.3"; }; + sbcl_2_4_4 = wrapLisp { + pkg = callPackage ../development/compilers/sbcl { version = "2.4.4"; }; faslExt = "fasl"; flags = [ "--dynamic-space-size" "3000" ]; }; - sbcl = sbcl_2_4_3; + sbcl = sbcl_2_4_4; sbclPackages = recurseIntoAttrs sbcl.pkgs; @@ -27174,9 +27169,7 @@ with pkgs; fatrace = callPackage ../os-specific/linux/fatrace { }; - ffado = libsForQt5.callPackage ../os-specific/linux/ffado { - inherit (linuxPackages) kernel; - }; + ffado = libsForQt5.callPackage ../os-specific/linux/ffado { }; libffado = ffado; fbterm = callPackage ../os-specific/linux/fbterm { }; @@ -31276,8 +31269,6 @@ with pkgs; fractal = callPackage ../applications/networking/instant-messengers/fractal { }; - fragments = callPackage ../applications/networking/p2p/fragments { }; - freedv = callPackage ../applications/radio/freedv { inherit (darwin.apple_sdk.frameworks) AppKit AVFoundation Cocoa CoreMedia; codec2 = codec2.override { @@ -31320,10 +31311,19 @@ with pkgs; pulseaudio-module-xrdp = callPackage ../applications/networking/remote/xrdp/pulseaudio-module-xrdp { }; - freerdp = callPackage ../applications/networking/remote/freerdp { - inherit (darwin.apple_sdk.frameworks) AudioToolbox AVFoundation Carbon Cocoa CoreMedia; - inherit (gst_all_1) gstreamer gst-plugins-base gst-plugins-good; - }; + inherit + ({ + freerdp = callPackage ../applications/networking/remote/freerdp { + inherit (darwin.apple_sdk.frameworks) AudioToolbox AVFoundation Carbon Cocoa CoreMedia; + inherit (gst_all_1) gstreamer gst-plugins-base gst-plugins-good; + }; + freerdp3 = callPackage ../applications/networking/remote/freerdp/3.nix { + inherit (darwin.apple_sdk.frameworks) AudioToolbox AVFoundation Carbon Cocoa CoreMedia; + }; + }) + freerdp + freerdp3 + ; freerdpUnstable = freerdp; @@ -31428,7 +31428,7 @@ with pkgs; m32edit = callPackage ../applications/audio/midas/m32edit.nix { }; - manim = callPackage ../applications/video/manim { }; + manim = python3Packages.toPythonApplication python3Packages.manim; manim-slides = python3Packages.toPythonApplication ( python3Packages.manim-slides.override { @@ -33674,10 +33674,6 @@ with pkgs; oranda = callPackage ../applications/misc/oranda { }; - orca = python3Packages.callPackage ../applications/misc/orca { - inherit pkg-config; - }; - orca-c = callPackage ../applications/audio/orca-c { }; organicmaps = qt6Packages.callPackage ../applications/misc/organicmaps { }; @@ -34417,8 +34413,6 @@ with pkgs; shavee = callPackage ../applications/misc/shavee { }; - shell_gpt = callPackage ../tools/llm/shell_gpt { }; - shfmt = callPackage ../tools/text/shfmt { }; shipments = callPackage ../applications/misc/shipments { }; @@ -37815,6 +37809,7 @@ with pkgs; gnome43Extensions gnome44Extensions gnome45Extensions + gnome46Extensions ; gnome-connections = callPackage ../desktops/gnome/apps/gnome-connections { }; @@ -39046,8 +39041,6 @@ with pkgs; scilla = callPackage ../tools/security/scilla { }; - scotch = callPackage ../applications/science/math/scotch { }; - mininet = callPackage ../tools/virtualization/mininet { }; msieve = callPackage ../applications/science/math/msieve { }; @@ -40092,7 +40085,7 @@ with pkgs; rfc-bibtex = callPackage ../tools/typesetting/rfc-bibtex { }; pick-colour-picker = python3Packages.callPackage ../applications/graphics/pick-colour-picker { - inherit glib gtk3 gobject-introspection wrapGAppsHook; + inherit glib gtk3 gobject-introspection wrapGAppsHook3; }; rpl = callPackage ../tools/text/rpl { }; |