diff options
Diffstat (limited to 'pkgs/top-level/all-packages.nix')
-rw-r--r-- | pkgs/top-level/all-packages.nix | 92 |
1 files changed, 61 insertions, 31 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5d065c8cb599..2a2eb37fa0ca 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -816,7 +816,7 @@ with pkgs; enum4linux = callPackage ../tools/security/enum4linux { }; - enum4linux-ng = python3Packages.callPackage ../tools/security/enum4linux-ng { }; + enum4linux-ng = callPackage ../tools/security/enum4linux-ng { }; enumerepo = callPackage ../tools/security/enumerepo {}; @@ -2621,6 +2621,11 @@ with pkgs; _86Box = callPackage ../applications/emulators/86box { }; + _86Box-with-roms = _86Box.override { + unfreeEnableRoms = true; + unfreeEnableDiscord = true; + }; + attract-mode = callPackage ../applications/emulators/attract-mode { }; basiliskii = callPackage ../applications/emulators/basiliskii { }; @@ -7830,7 +7835,10 @@ with pkgs; choose = callPackage ../tools/text/choose { }; - d2 = callPackage ../tools/text/d2 { }; + d2 = callPackage ../tools/text/d2 { + # Failed tests + buildGoModule = buildGo121Module; + }; ddev = callPackage ../applications/virtualization/ddev { }; @@ -7866,8 +7874,6 @@ with pkgs; callPackage ../servers/search/elasticsearch/plugins.nix {} ); - elasticsearch-curator = callPackage ../tools/admin/elasticsearch-curator { }; - embree = callPackage ../development/libraries/embree { }; embree2 = callPackage ../development/libraries/embree/2.x.nix { }; @@ -13125,7 +13131,7 @@ with pkgs; sipsak = callPackage ../tools/networking/sipsak { }; - sipvicious = python3Packages.callPackage ../tools/security/sipvicious { }; + sipvicious = callPackage ../tools/security/sipvicious { }; siril = callPackage ../applications/science/astronomy/siril { }; @@ -16524,6 +16530,31 @@ with pkgs; targetLlvm = targetPackages.llvmPackages_17.llvm or llvmPackages_17.llvm; })); + inherit + (rec { + llvmPackages_18 = recurseIntoAttrs (callPackage ../development/compilers/llvm/18 ({ + inherit (stdenvAdapters) overrideCC; + buildLlvmTools = buildPackages.llvmPackages_18.tools; + targetLlvmLibraries = targetPackages.llvmPackages_18.libraries or llvmPackages_18.libraries; + targetLlvm = targetPackages.llvmPackages_18.llvm or llvmPackages_18.llvm; + })); + + clang_18 = llvmPackages_18.clang; + lld_18 = llvmPackages_18.lld; + lldb_18 = llvmPackages_18.lldb; + llvm_18 = llvmPackages_18.llvm; + + clang-tools_18 = callPackage ../development/tools/clang-tools { + llvmPackages = llvmPackages_18; + }; + }) + llvmPackages_18 + clang_18 + lld_18 + lldb_18 + llvm_18 + clang-tools_18; + lorri = callPackage ../tools/misc/lorri { inherit (darwin.apple_sdk.frameworks) CoreServices Security; }; @@ -22279,7 +22310,6 @@ with pkgs; libdwarf = callPackage ../development/libraries/libdwarf { }; dwarfdump = libdwarf.bin; - libdwarf_20210528 = callPackage ../development/libraries/libdwarf/20210528.nix { }; libe57format = callPackage ../development/libraries/libe57format { }; @@ -24107,18 +24137,28 @@ with pkgs; protobuf = protobuf_24; - protobuf_25 = callPackage ../development/libraries/protobuf/25.nix { }; - protobuf_24 = callPackage ../development/libraries/protobuf/24.nix { }; - protobuf_23 = callPackage ../development/libraries/protobuf/23.nix { - abseil-cpp = abseil-cpp_202301; - }; - protobuf_21 = callPackage ../development/libraries/protobuf/21.nix { - abseil-cpp = abseil-cpp_202103; - }; - - protobuf3_20 = callPackage ../development/libraries/protobuf/3.20.nix { - abseil-cpp = abseil-cpp_202103; - }; + inherit + ({ + protobuf_26 = callPackage ../development/libraries/protobuf/26.nix { }; + protobuf_25 = callPackage ../development/libraries/protobuf/25.nix { }; + protobuf_24 = callPackage ../development/libraries/protobuf/24.nix { }; + protobuf_23 = callPackage ../development/libraries/protobuf/23.nix { + abseil-cpp = abseil-cpp_202301; + }; + protobuf_21 = callPackage ../development/libraries/protobuf/21.nix { + abseil-cpp = abseil-cpp_202103; + }; + protobuf3_20 = callPackage ../development/libraries/protobuf/3.20.nix { + abseil-cpp = abseil-cpp_202103; + }; + }) + protobuf_26 + protobuf_25 + protobuf_24 + protobuf_23 + protobuf_21 + protobuf3_20 + ; protobufc = callPackage ../development/libraries/protobufc { }; @@ -25376,8 +25416,6 @@ with pkgs; fastjar = callPackage ../development/tools/java/fastjar { }; - jextract = callPackage ../development/tools/java/jextract { }; - httpunit = callPackage ../development/libraries/java/httpunit { }; javaCup = callPackage ../development/libraries/java/cup { @@ -30629,8 +30667,6 @@ with pkgs; dk = callPackage ../applications/window-managers/dk { }; - docker-credential-gcr = callPackage ../tools/admin/docker-credential-gcr { }; - docker-credential-helpers = callPackage ../tools/admin/docker-credential-helpers { }; dockstarter = callPackage ../tools/virtualization/dockstarter { }; @@ -34872,7 +34908,7 @@ with pkgs; stalonetray = callPackage ../applications/window-managers/stalonetray { }; - inherit (ocaml-ng.ocamlPackages_4_12) stog; + inherit (ocaml-ng.ocamlPackages) stog; stp = callPackage ../applications/science/logic/stp { }; @@ -35747,7 +35783,7 @@ with pkgs; weave-gitops = callPackage ../applications/networking/cluster/weave-gitops { }; wayfire = callPackage ../applications/window-managers/wayfire/default.nix { - wlroots = wlroots_0_16; + wlroots = wlroots_0_17; }; wf-config = callPackage ../applications/window-managers/wayfire/wf-config.nix { }; @@ -37402,8 +37438,6 @@ with pkgs; portmod = callPackage ../games/portmod { }; - tetrio-desktop = callPackage ../games/tetrio-desktop { }; - tr-patcher = callPackage ../games/tr-patcher { }; tes3cmd = callPackage ../games/tes3cmd { }; @@ -38485,8 +38519,6 @@ with pkgs; ecos = callPackage ../development/libraries/science/math/ecos { }; - flintqs = callPackage ../development/libraries/science/math/flintqs { }; - getdp = callPackage ../applications/science/math/getdp { }; gurobi = callPackage ../applications/science/math/gurobi { @@ -41047,9 +41079,7 @@ with pkgs; openrisk = callPackage ../tools/security/openrisk { }; - openvino = callPackage ../development/libraries/openvino { - python = python3; - }; + openvino = callPackage ../development/libraries/openvino { }; phonetisaurus = callPackage ../development/libraries/phonetisaurus { # https://github.com/AdolfVonKleist/Phonetisaurus/issues/70 |