diff --git a/pkgs/by-name/kc/kconfig-frontends/package.nix b/pkgs/by-name/kc/kconfig-frontends/package.nix index 8b38246d67d5..954ca475a75d 100644 --- a/pkgs/by-name/kc/kconfig-frontends/package.nix +++ b/pkgs/by-name/kc/kconfig-frontends/package.nix @@ -1,16 +1,46 @@ -{ lib, stdenv, fetchurl, pkg-config, bison, flex, gperf, ncurses, python3, bash }: +{ lib +, stdenv +, fetchurl +, bash +, bison +, flex +, gperf +, ncurses +, pkg-config +, python3 +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "kconfig-frontends"; version = "4.11.0.1"; src = fetchurl { - sha256 = "1xircdw3k7aaz29snf96q2fby1cs48bidz5l1kkj0a5gbivw31i3"; - url = "http://ymorin.is-a-geek.org/download/kconfig-frontends/kconfig-frontends-${version}.tar.xz"; + url = "https://bitbucket.org/nuttx/tools/downloads/kconfig-frontends-${finalAttrs.version}.tar.bz2"; + hash = "sha256-yxg4z+Lwl7oJyt4n1HUncg1bKeK3FcCpbDPQtqELqxM="; }; - nativeBuildInputs = [ bison flex gperf pkg-config ]; - buildInputs = [ bash ncurses python3 ]; + patches = [ + # This patch is a fixed file, there is no need to normalize it + (fetchurl { + url = "https://bitbucket.org/nuttx/tools/downloads/gperf3.1_kconfig_id_lookup.patch"; + hash = "sha256-cqAWjRnMA/fJ8wnEfUxoPEW0hIJY/mprE6/TQMY6NPI="; + }) + ]; + + outputs = [ "out" "lib" "dev" "doc" ]; + + nativeBuildInputs = [ + bison + flex + gperf + pkg-config + ]; + + buildInputs = [ + bash + ncurses + python3 + ]; strictDeps = true; @@ -20,7 +50,7 @@ stdenv.mkDerivation rec { env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=format-security"; - meta = with lib; { + meta = { description = "Out of Linux tree packaging of the kconfig infrastructure"; longDescription = '' Configuration language and system for the Linux kernel and other @@ -28,9 +58,9 @@ stdenv.mkDerivation rec { types, simple organization of options, and direct and reverse dependencies. ''; - homepage = "http://ymorin.is-a-geek.org/projects/kconfig-frontends"; - license = licenses.gpl2; - platforms = platforms.unix; - maintainers = with maintainers; [ mbe ]; + homepage = "https://bitbucket.org/nuttx/tools/"; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ AndersonTorres ]; + platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dc6bbf4ef8b7..5a23e5416f95 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19515,10 +19515,6 @@ with pkgs; kcc = libsForQt5.callPackage ../applications/graphics/kcc { }; - kconfig-frontends = callPackage ../by-name/kc/kconfig-frontends/package.nix { - gperf = gperf_3_0; - }; - kcgi = callPackage ../development/web/kcgi { }; kcov = callPackage ../development/tools/analysis/kcov { };