From 2f53e94cc9ed3aae22a602f9426817359cde7964 Mon Sep 17 00:00:00 2001 From: Colin Date: Sun, 6 Aug 2023 08:11:27 +0000 Subject: [PATCH] mepo_1_1: remove package i can just use normal `mepo` now. --- overlays/cross.nix | 18 ------------------ pkgs/additional/mepo_1_1/default.nix | 17 ----------------- pkgs/default.nix | 1 - 3 files changed, 36 deletions(-) delete mode 100644 pkgs/additional/mepo_1_1/default.nix diff --git a/overlays/cross.nix b/overlays/cross.nix index 074592d9..e4f52504 100644 --- a/overlays/cross.nix +++ b/overlays/cross.nix @@ -844,24 +844,6 @@ in { # depsBuildBuild = (upstream.depsBuildBuild or []) ++ [ final.pkg-config ]; }); - # mepo_1_1 = emulateBuildMachine (prev.mepo_1_1.override { - # zig_0_9 = final.zig_0_9.overrideAttrs (upstream: { - # cmakeFlags = (upstream.cmakeFlags or []) ++ [ - # "-DZIG_EXECUTABLE=${final.buildPackages.zig_0_9}/bin/zig" - # ]; - # doInstallCheck = false; - # }); - # }); - mepo_1_1 = emulateBuildMachine (prev.mepo_1_1.override { - zig_0_9 = emulateBuildMachine (final.zig_0_9.overrideAttrs (upstream: { - cmakeFlags = (upstream.cmakeFlags or []) ++ [ - # "-DZIG_EXECUTABLE=${final.buildPackages.zig_0_9}/bin/zig" - "-DZIG_TARGET_TRIPLE=aarch64-linux-gnu" - ]; - doInstallCheck = false; - })); - }); - mepo = prev.mepo.overrideAttrs (upstream: { doCheck = false; nativeBuildInputs = upstream.nativeBuildInputs ++ [ diff --git a/pkgs/additional/mepo_1_1/default.nix b/pkgs/additional/mepo_1_1/default.nix deleted file mode 100644 index 7056dad8..00000000 --- a/pkgs/additional/mepo_1_1/default.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ stdenv -, mepo -, fetchFromSourcehut -, zig_0_9 -}: -(mepo.override { - inherit stdenv; #< for easier `override` in cross.nix - zig = zig_0_9; -}).overrideAttrs (orig: rec { - version = "1.1"; - src = fetchFromSourcehut { - owner = "~mil"; - repo = "mepo"; - rev = version; - hash = "sha256-OIZ617QLjiTiDwcsn0DnRussYtjDkVyifr2mdSqA98A="; - }; -}) diff --git a/pkgs/default.nix b/pkgs/default.nix index 02fa7a90..5e12b882 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -41,7 +41,6 @@ let ldd-aarch64 = callPackage ./additional/ldd-aarch64 { }; lightdm-mobile-greeter = callPackage ./additional/lightdm-mobile-greeter { }; linux-megous = callPackage ./additional/linux-megous { }; - mepo_1_1 = callPackage ./additional/mepo_1_1 { }; mpv-uosc-latest = callPackage ./additional/mpv-uosc-latest { }; mx-sanebot = callPackage ./additional/mx-sanebot { }; rtl8723cs-firmware = callPackage ./additional/rtl8723cs-firmware { };