diff options
Diffstat (limited to 'pkgs/top-level/all-packages.nix')
-rw-r--r-- | pkgs/top-level/all-packages.nix | 34 |
1 files changed, 14 insertions, 20 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index edbca207f1aa..92b34d44c36c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5631,8 +5631,8 @@ with pkgs; cairo = cairo.override { xcbSupport = true; }; }; hyprland = callPackage ../applications/window-managers/hyprwm/hyprland { - wlroots = callPackage ../applications/window-managers/hyprwm/hyprland/wlroots.nix { }; - udis86 = callPackage ../applications/window-managers/hyprwm/hyprland/udis86.nix { }; + wlroots-hyprland = callPackage ../applications/window-managers/hyprwm/hyprland/wlroots.nix { }; + udis86-hyprland = callPackage ../applications/window-managers/hyprwm/hyprland/udis86.nix { }; }; hyprland-autoname-workspaces = callPackage ../applications/misc/hyprland-autoname-workspaces { }; @@ -6252,8 +6252,6 @@ with pkgs; reg = callPackage ../tools/virtualization/reg { }; - retool = callPackage ../applications/misc/retool { }; - rex = callPackage ../tools/system/rex { }; river = callPackage ../applications/window-managers/river { }; @@ -13311,7 +13309,7 @@ with pkgs; sparrow-unwrapped = callPackage ../applications/blockchains/sparrow { openimajgrabber = callPackage ../applications/blockchains/sparrow/openimajgrabber.nix {}; - openjdk = openjdk.override { enableJavaFX = true; }; + openjdk = openjdk21.override { enableJavaFX = true; }; }; sparrow = callPackage ../applications/blockchains/sparrow/fhsenv.nix { }; @@ -15544,7 +15542,7 @@ with pkgs; ocamlPackages = ocaml-ng.ocamlPackages_4_14; }; - inherit (coqPackages_8_17) compcert; + inherit (coqPackages) compcert; computecpp-unwrapped = callPackage ../development/compilers/computecpp { }; computecpp = wrapCCWith rec { @@ -15714,9 +15712,6 @@ with pkgs; gcc12Stdenv = overrideCC gccStdenv buildPackages.gcc12; gcc13Stdenv = overrideCC gccStdenv buildPackages.gcc13; - # Meant for packages that fail with newer than gcc10. - gcc10StdenvCompat = if stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "11" then gcc10Stdenv else stdenv; - # This is not intended for use in nixpkgs but for providing a faster-running # compiler to nixpkgs users by building gcc with reproducibility-breaking # profile-guided optimizations @@ -16643,7 +16638,7 @@ with pkgs; nvidia_cg_toolkit = callPackage ../development/compilers/nvidia-cg-toolkit { }; obliv-c = callPackage ../development/compilers/obliv-c { - stdenv = gcc10StdenvCompat; + stdenv = gcc10Stdenv; ocamlPackages = ocaml-ng.ocamlPackages_4_14; }; @@ -16831,9 +16826,13 @@ with pkgs; buildPgxExtension = callPackage ../development/tools/rust/cargo-pgx/buildPgxExtension.nix { inherit (darwin.apple_sdk.frameworks) Security; }; - cargo-pgrx = callPackage ../development/tools/rust/cargo-pgrx/default.nix { - inherit (darwin.apple_sdk.frameworks) Security; - }; + inherit (callPackages ../development/tools/rust/cargo-pgrx { }) + cargo-pgrx_0_10_2 + cargo-pgrx_0_11_2 + cargo-pgrx_0_11_3 + ; + cargo-pgrx = cargo-pgrx_0_11_2; + buildPgrxExtension = callPackage ../development/tools/rust/cargo-pgrx/buildPgrxExtension.nix { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -33833,12 +33832,7 @@ with pkgs; opentimestamps-client = python3Packages.callPackage ../tools/misc/opentimestamps-client { }; - opentoonz = let - opentoonz-libtiff = callPackage ../applications/graphics/opentoonz/libtiff.nix { }; - in qt5.callPackage ../applications/graphics/opentoonz { - libtiff = opentoonz-libtiff; - opencv = opencv.override { libtiff = opentoonz-libtiff; }; - }; + opentoonz = libsForQt5.callPackage ../applications/graphics/opentoonz { }; opentabletdriver = callPackage ../tools/X11/opentabletdriver { }; @@ -35960,7 +35954,7 @@ with pkgs; kodi-cli = callPackage ../tools/misc/kodi-cli { }; - xca = libsForQt5.callPackage ../applications/misc/xca { }; + xca = qt6Packages.callPackage ../applications/misc/xca { }; xcalib = callPackage ../tools/X11/xcalib { }; |