diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-11-29 06:01:32 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-29 06:01:32 +0000 |
| commit | e2e339af901485e2f147e1761ac0bfa762a8b9c1 (patch) | |
| tree | 06d6183a74f8a74de0980fd1a78e00f87ca6a979 /pkgs/top-level | |
| parent | f63d259d88c3d60643217cb4ae58bc86fdf97439 (diff) | |
| parent | a098648f8db8dc6f45b299b80c03ebb897de9f4c (diff) | |
| download | nixlib-e2e339af901485e2f147e1761ac0bfa762a8b9c1.tar nixlib-e2e339af901485e2f147e1761ac0bfa762a8b9c1.tar.gz nixlib-e2e339af901485e2f147e1761ac0bfa762a8b9c1.tar.bz2 nixlib-e2e339af901485e2f147e1761ac0bfa762a8b9c1.tar.lz nixlib-e2e339af901485e2f147e1761ac0bfa762a8b9c1.tar.xz nixlib-e2e339af901485e2f147e1761ac0bfa762a8b9c1.tar.zst nixlib-e2e339af901485e2f147e1761ac0bfa762a8b9c1.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 | ||||
| -rw-r--r-- | pkgs/top-level/ocaml-packages.nix | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ddf12467ffd0..5a92e4d9cd49 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -34286,7 +34286,7 @@ with pkgs; pdfdiff = callPackage ../applications/misc/pdfdiff { }; pdfsam-basic = callPackage ../applications/misc/pdfsam-basic { - jdk19 = openjdk19.override { enableJavaFX = true; }; + jdk21 = openjdk21.override { enableJavaFX = true; }; }; mupdf = callPackage ../applications/misc/mupdf { }; @@ -40566,8 +40566,6 @@ with pkgs; morph = callPackage ../tools/package-management/morph { }; - mus = callPackage ../applications/audio/mus { }; - muse = libsForQt5.callPackage ../applications/audio/muse { }; museeks = callPackage ../applications/audio/museeks { }; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index e8c05d43c7c7..adbec01c46ef 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -806,7 +806,7 @@ let lwt_ppx = self.lwt_ppx.override { inherit ppxlib; }; sedlex = self.sedlex.override { inherit ppxlib ppx_expect; }; in callPackage ../development/ocaml-modules/bap { - inherit (pkgs.llvmPackages) llvm; + inherit (pkgs.llvmPackages_14) llvm; ezjsonm = self.ezjsonm.override { inherit sexplib0; }; ppx_bitstring = self.ppx_bitstring.override { inherit ppxlib; }; ocurl = self.ocurl.override { inherit lwt_ppx; }; |