From cc7d944ec69bb192565ce6858bbfa36f8cd52fad Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Thu, 21 Aug 2025 09:07:58 +0200 Subject: [PATCH] wavm: move to by-name --- .../wavm/default.nix => by-name/wa/wavm/package.nix} | 6 +++--- pkgs/top-level/all-packages.nix | 4 ---- 2 files changed, 3 insertions(+), 7 deletions(-) rename pkgs/{development/interpreters/wavm/default.nix => by-name/wa/wavm/package.nix} (85%) diff --git a/pkgs/development/interpreters/wavm/default.nix b/pkgs/by-name/wa/wavm/package.nix similarity index 85% rename from pkgs/development/interpreters/wavm/default.nix rename to pkgs/by-name/wa/wavm/package.nix index 82ee3fee4eb6..d56fba46cb56 100644 --- a/pkgs/development/interpreters/wavm/default.nix +++ b/pkgs/by-name/wa/wavm/package.nix @@ -1,11 +1,11 @@ { lib, - llvmPackages, + llvmPackages_12, fetchFromGitHub, cmake, }: -llvmPackages.stdenv.mkDerivation (finalAttrs: { +llvmPackages_12.stdenv.mkDerivation (finalAttrs: { pname = "wavm"; version = "2022-05-14"; @@ -18,7 +18,7 @@ llvmPackages.stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake - llvmPackages.llvm + llvmPackages_12.llvm ]; meta = with lib; { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6156084c5935..629cd6b8794b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15773,10 +15773,6 @@ with pkgs; llvmPackages = llvmPackages_18; }; - wavm = callPackage ../development/interpreters/wavm { - llvmPackages = llvmPackages_12; - }; - wibo = pkgsi686Linux.callPackage ../applications/emulators/wibo { }; winePackagesFor =