From b43389f49d52db6084abf6ad26872e8d93d74fc7 Mon Sep 17 00:00:00 2001 From: Kid <44045911+kidonng@users.noreply.github.com> Date: Sun, 8 Aug 2021 10:59:48 +0000 Subject: [PATCH] iasl: drop pacakge --- .../virtualization/OVMF/default.nix | 4 +-- .../virtualization/seabios/default.nix | 5 ++- .../virtualization/virtualbox/default.nix | 14 ++------ .../virtualization/xen/generic.nix | 4 +-- pkgs/development/compilers/edk2/default.nix | 1 - pkgs/development/compilers/iasl/default.nix | 33 ------------------- pkgs/os-specific/linux/fwts/default.nix | 6 ++-- pkgs/tools/misc/coreboot-utils/default.nix | 4 +-- pkgs/tools/system/acpica-tools/default.nix | 1 + pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- 11 files changed, 15 insertions(+), 60 deletions(-) delete mode 100644 pkgs/development/compilers/iasl/default.nix diff --git a/pkgs/applications/virtualization/OVMF/default.nix b/pkgs/applications/virtualization/OVMF/default.nix index aed59e05a980..d8b6dfc2efaa 100644 --- a/pkgs/applications/virtualization/OVMF/default.nix +++ b/pkgs/applications/virtualization/OVMF/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, edk2, util-linux, nasm, iasl +{ stdenv, lib, edk2, util-linux, nasm, acpica-tools , csmSupport ? false, seabios ? null , secureBoot ? false , httpSupport ? false @@ -25,7 +25,7 @@ edk2.mkDerivation projectDscPath { outputs = [ "out" "fd" ]; - buildInputs = [ util-linux nasm iasl ]; + buildInputs = [ util-linux nasm acpica-tools ]; hardeningDisable = [ "format" "stackprotector" "pic" "fortify" ]; diff --git a/pkgs/applications/virtualization/seabios/default.nix b/pkgs/applications/virtualization/seabios/default.nix index 42e1eaf56d4d..a97c43495703 100644 --- a/pkgs/applications/virtualization/seabios/default.nix +++ b/pkgs/applications/virtualization/seabios/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, iasl, python3 }: +{ lib, stdenv, fetchurl, acpica-tools, python3 }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ python3 ]; - buildInputs = [ iasl ]; + buildInputs = [ acpica-tools ]; strictDeps = true; @@ -47,4 +47,3 @@ stdenv.mkDerivation rec { platforms = [ "i686-linux" "x86_64-linux" ]; }; } - diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index 31f485768031..c693fa8fdcf1 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -1,4 +1,4 @@ -{ config, stdenv, fetchurl, lib, iasl, dev86, pam, libxslt, libxml2, wrapQtAppsHook +{ config, stdenv, fetchurl, lib, acpica-tools, dev86, pam, libxslt, libxml2, wrapQtAppsHook , libX11, xorgproto, libXext, libXcursor, libXmu, libIDL, SDL, libcap, libGL , libpng, glib, lvm2, libXrandr, libXinerama, libopus, qtbase, qtx11extras , qttools, qtsvg, qtwayland, pkg-config, which, docbook_xsl, docbook_xml_dtd_43 @@ -24,16 +24,6 @@ let # Use maintainers/scripts/update.nix to update the version and all related hashes or # change the hashes in extpack.nix and guest-additions/default.nix as well manually. version = "6.1.26"; - - iasl' = iasl.overrideAttrs (old: rec { - inherit (old) pname; - version = "20190108"; - src = fetchurl { - url = "https://acpica.org/sites/acpica/files/acpica-unix-${version}.tar.gz"; - sha256 = "0bqhr3ndchvfhxb31147z8gd81dysyz5dwkvmp56832d0js2564q"; - }; - NIX_CFLAGS_COMPILE = old.NIX_CFLAGS_COMPILE + " -Wno-error=stringop-truncation"; - }); in stdenv.mkDerivation { pname = "virtualbox"; inherit version; @@ -52,7 +42,7 @@ in stdenv.mkDerivation { dontWrapQtApps = true; buildInputs = - [ iasl' dev86 libxslt libxml2 xorgproto libX11 libXext libXcursor libIDL + [ acpica-tools dev86 libxslt libxml2 xorgproto libX11 libXext libXcursor libIDL libcap glib lvm2 alsa-lib curl libvpx pam makeself perl libXmu libpng libopus python ] ++ optional javaBindings jdk diff --git a/pkgs/applications/virtualization/xen/generic.nix b/pkgs/applications/virtualization/xen/generic.nix index 3d0ff3a6f336..8299304045d0 100644 --- a/pkgs/applications/virtualization/xen/generic.nix +++ b/pkgs/applications/virtualization/xen/generic.nix @@ -3,7 +3,7 @@ config: # Xen , bison, bzip2, checkpolicy, dev86, figlet, flex, gettext, glib -, iasl, libaio, libiconv, libuuid, ncurses, openssl, perl +, acpica-tools, libaio, libiconv, libuuid, ncurses, openssl, perl , python2Packages # python2Packages.python , xz, yajl, zlib @@ -71,7 +71,7 @@ stdenv.mkDerivation (rec { cmake which # Xen - bison bzip2 checkpolicy dev86 figlet flex gettext glib iasl libaio + bison bzip2 checkpolicy dev86 figlet flex gettext glib acpica-tools libaio libiconv libuuid ncurses openssl perl python2Packages.python xz yajl zlib # oxenstored diff --git a/pkgs/development/compilers/edk2/default.nix b/pkgs/development/compilers/edk2/default.nix index 9d1abc11af19..1a6685e91411 100644 --- a/pkgs/development/compilers/edk2/default.nix +++ b/pkgs/development/compilers/edk2/default.nix @@ -5,7 +5,6 @@ fetchpatch, libuuid, python3, - iasl, bc, clang_9, llvmPackages_9, diff --git a/pkgs/development/compilers/iasl/default.nix b/pkgs/development/compilers/iasl/default.nix deleted file mode 100644 index a31e1ff3f6a9..000000000000 --- a/pkgs/development/compilers/iasl/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{lib, stdenv, fetchurl, bison, flex}: - -stdenv.mkDerivation rec { - pname = "iasl"; - version = "20210730"; - - src = fetchurl { - url = "https://acpica.org/sites/acpica/files/acpica-unix-${version}.tar.gz"; - sha256 = "1pmm977nyl3bs71ipzcl4dh30qm8x9wm2p2ml0m62rl62kai832a"; - }; - - NIX_CFLAGS_COMPILE = "-O3"; - - buildFlags = [ "iasl" ]; - - nativeBuildInputs = [ bison flex ]; - - installPhase = - '' - runHook preInstall - - install -Dm755 generate/unix/bin*/iasl -t $out/bin - - runHook postInstall - ''; - - meta = { - description = "Intel ACPI Compiler"; - homepage = "http://www.acpica.org/"; - license = lib.licenses.iasl; - platforms = lib.platforms.unix; - }; -} diff --git a/pkgs/os-specific/linux/fwts/default.nix b/pkgs/os-specific/linux/fwts/default.nix index d937d4b75f65..ea42e90a3fe8 100644 --- a/pkgs/os-specific/linux/fwts/default.nix +++ b/pkgs/os-specific/linux/fwts/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchzip, autoreconfHook, pkg-config, glib, pcre -, json_c, flex, bison, dtc, pciutils, dmidecode, iasl, libbsd }: +, json_c, flex, bison, dtc, pciutils, dmidecode, acpica-tools, libbsd }: stdenv.mkDerivation rec { pname = "fwts"; @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ autoreconfHook pkg-config ]; - buildInputs = [ glib pcre json_c flex bison dtc pciutils dmidecode iasl libbsd ]; + buildInputs = [ glib pcre json_c flex bison dtc pciutils dmidecode acpica-tools libbsd ]; postPatch = '' substituteInPlace src/lib/include/fwts_binpaths.h \ --replace "/usr/bin/lspci" "${pciutils}/bin/lspci" \ --replace "/usr/sbin/dmidecode" "${dmidecode}/bin/dmidecode" \ - --replace "/usr/bin/iasl" "${iasl}/bin/iasl" + --replace "/usr/bin/iasl" "${acpica-tools}/bin/iasl" ''; enableParallelBuilding = true; diff --git a/pkgs/tools/misc/coreboot-utils/default.nix b/pkgs/tools/misc/coreboot-utils/default.nix index 95f9c74f5ade..7b47f904a98f 100644 --- a/pkgs/tools/misc/coreboot-utils/default.nix +++ b/pkgs/tools/misc/coreboot-utils/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, zlib, pciutils, coreutils, acpica-tools, iasl, makeWrapper, gnugrep, gnused, file, buildEnv }: +{ lib, stdenv, fetchurl, zlib, pciutils, coreutils, acpica-tools, makeWrapper, gnugrep, gnused, file, buildEnv }: let version = "4.14"; @@ -91,7 +91,7 @@ let dontBuild = true; installPhase = "install -Dm755 acpidump-all $out/bin/acpidump-all"; postFixup = let - binPath = [ coreutils acpica-tools iasl gnugrep gnused file ]; + binPath = [ coreutils acpica-tools gnugrep gnused file ]; in "wrapProgram $out/bin/acpidump-all --set PATH ${lib.makeBinPath binPath}"; }; }; diff --git a/pkgs/tools/system/acpica-tools/default.nix b/pkgs/tools/system/acpica-tools/default.nix index 2d2033aadef3..b035ae04215d 100644 --- a/pkgs/tools/system/acpica-tools/default.nix +++ b/pkgs/tools/system/acpica-tools/default.nix @@ -21,6 +21,7 @@ stdenv.mkDerivation rec { "acpihelp" "acpisrc" "acpixtract" + "iasl" ]; nativeBuildInputs = [ bison flex ]; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index ec92bfeb5832..e88c6978ad1f 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -339,6 +339,7 @@ mapAliases ({ htmlTidy = html-tidy; # added 2014-12-06 hydra-flakes = throw "hydra-flakes: Flakes support has been merged into Hydra's master. Please use `hydra-unstable` now."; # added 2020-04-06 iana_etc = iana-etc; # added 2017-03-08 + iasl = throw "iasl has been removed, use acpica-tools instead"; # added 2021-08-08 icedtea8_web = adoptopenjdk-icedtea-web; # added 2019-08-21 icedtea_web = adoptopenjdk-icedtea-web; # added 2019-08-21 idea = jetbrains; # added 2017-04-03 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0c1e8404fc65..94288d3fe638 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5954,8 +5954,6 @@ with pkgs; i2pd = callPackage ../tools/networking/i2pd { }; - iasl = callPackage ../development/compilers/iasl { }; - iannix = libsForQt5.callPackage ../applications/audio/iannix { }; jamulus = libsForQt5.callPackage ../applications/audio/jamulus { };