From d39a026cc2669ab842704c62e586cb8c5195b30a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 28 Feb 2022 12:43:31 -0800 Subject: [PATCH] txr: 273 -> 274 (#162228) * txr: 273 -> 274 * txr: latest clang stdenv, fixes w/musl I have not identified a cause but since this resolves the issue let's use latest clang for now. * txr: no longer needs bison/flex unless in maintainer mode Co-authored-by: Will Dietz --- pkgs/tools/misc/txr/default.nix | 7 +++---- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/misc/txr/default.nix b/pkgs/tools/misc/txr/default.nix index d8ba08611207..4b521ed9ddaa 100644 --- a/pkgs/tools/misc/txr/default.nix +++ b/pkgs/tools/misc/txr/default.nix @@ -1,15 +1,14 @@ -{ lib, stdenv, fetchurl, bison, flex, libffi, coreutils }: +{ lib, stdenv, fetchurl, libffi, coreutils }: stdenv.mkDerivation rec { pname = "txr"; - version = "273"; + version = "274"; src = fetchurl { url = "http://www.kylheku.com/cgit/txr/snapshot/${pname}-${version}.tar.bz2"; - sha256 = "sha256-l0o60NktIsKn720kO8xzySQBMAVrfYhhWZ8L5K8QrUg="; + sha256 = "sha256-bWgz0kmPLN0V0rkFRiCqxkBjhN8FV9fL+Vu8GSw9Ja4="; }; - nativeBuildInputs = [ bison flex ]; buildInputs = [ libffi ]; enableParallelBuilding = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a8b54c390f85..e49e28257d17 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10604,7 +10604,7 @@ with pkgs; twurl = callPackage ../tools/misc/twurl { }; - txr = callPackage ../tools/misc/txr { stdenv = clangStdenv; }; + txr = callPackage ../tools/misc/txr { inherit (llvmPackages_latest) stdenv; }; txt2man = callPackage ../tools/misc/txt2man { };