diff options
Diffstat (limited to 'pkgs/top-level/all-packages.nix')
-rw-r--r-- | pkgs/top-level/all-packages.nix | 69 |
1 files changed, 16 insertions, 53 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c21673e4ff58..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 { }; @@ -7699,8 +7697,9 @@ with pkgs; rar2fs = callPackage ../tools/filesystems/rar2fs { }; - rocmPackages = rocmPackages_5; + rocmPackages = rocmPackages_6; rocmPackages_5 = recurseIntoAttrs (callPackage ../development/rocm-modules/5 { }); + rocmPackages_6 = recurseIntoAttrs (callPackage ../development/rocm-modules/6 { }); rune = callPackage ../development/interpreters/rune { }; @@ -13310,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 { }; @@ -15543,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 { @@ -15713,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 @@ -16642,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; }; @@ -16830,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; }; @@ -18216,44 +18216,12 @@ with pkgs; inherit (callPackages ../development/tools/electron/binary { }) electron-bin - electron_10-bin - electron_11-bin - electron_12-bin - electron_13-bin - electron_14-bin - electron_15-bin - electron_16-bin - electron_17-bin - electron_18-bin - electron_19-bin - electron_20-bin - electron_21-bin - electron_22-bin - electron_23-bin electron_24-bin - electron_25-bin - electron_26-bin electron_27-bin electron_28-bin electron_29-bin; - electron_10 = electron_10-bin; - electron_11 = electron_11-bin; - electron_12 = electron_12-bin; - electron_13 = electron_13-bin; - electron_14 = electron_14-bin; - electron_15 = electron_15-bin; - electron_16 = electron_16-bin; - electron_17 = electron_17-bin; - electron_18 = electron_18-bin; - electron_19 = electron_19-bin; - electron_20 = electron_20-bin; - electron_21 = electron_21-bin; - electron_22 = electron_22-bin; - electron_23 = electron_23-bin; electron_24 = electron_24-bin; - electron_25 = electron_25-bin; - electron_26 = electron_26-bin; electron_27 = if lib.meta.availableOn stdenv.hostPlatform electron-source.electron_27 then electron-source.electron_27 else electron_27-bin; electron_28 = if lib.meta.availableOn stdenv.hostPlatform electron-source.electron_28 then electron-source.electron_28 else electron_28-bin; electron_29 = if lib.meta.availableOn stdenv.hostPlatform electron-source.electron_29 then electron-source.electron_29 else electron_29-bin; @@ -33864,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 { }; @@ -35991,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 { }; |