diff options
| author | Will Dietz <w@wdtz.org> | 2022-01-31 13:12:27 -0600 |
|---|---|---|
| committer | Will Dietz <w@wdtz.org> | 2022-01-31 13:41:16 -0600 |
| commit | 95410d059f9d0dc8bf0540cf811043f66551ba04 (patch) | |
| tree | cbe2de1b0df352c39de4bf29ea6a1273f187fab3 /pkgs/tools/misc/txr | |
| parent | a529f0c125a78343b145a8eb2b915b0295e4f459 (diff) | |
| download | nixpkgs-95410d059f9d0dc8bf0540cf811043f66551ba04.tar nixpkgs-95410d059f9d0dc8bf0540cf811043f66551ba04.tar.gz nixpkgs-95410d059f9d0dc8bf0540cf811043f66551ba04.tar.bz2 nixpkgs-95410d059f9d0dc8bf0540cf811043f66551ba04.tar.lz nixpkgs-95410d059f9d0dc8bf0540cf811043f66551ba04.tar.xz nixpkgs-95410d059f9d0dc8bf0540cf811043f66551ba04.tar.zst nixpkgs-95410d059f9d0dc8bf0540cf811043f66551ba04.zip | |
txr: 231 -> 273
Fixup tests: * keep 017 tests (after fixing), * drop chmod test due to sticky bit failure
Diffstat (limited to 'pkgs/tools/misc/txr')
| -rw-r--r-- | pkgs/tools/misc/txr/default.nix | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/pkgs/tools/misc/txr/default.nix b/pkgs/tools/misc/txr/default.nix index d5a37e2e67f..d8ba0861120 100644 --- a/pkgs/tools/misc/txr/default.nix +++ b/pkgs/tools/misc/txr/default.nix @@ -1,12 +1,12 @@ -{ lib, stdenv, fetchurl, bison, flex, libffi }: +{ lib, stdenv, fetchurl, bison, flex, libffi, coreutils }: stdenv.mkDerivation rec { pname = "txr"; - version = "231"; + version = "273"; src = fetchurl { url = "http://www.kylheku.com/cgit/txr/snapshot/${pname}-${version}.tar.bz2"; - sha256 = "0mcglb84zfmrai2bcdg9j0ck8jp8h7ii2rf4m38yjggy0dvii2lc"; + sha256 = "sha256-l0o60NktIsKn720kO8xzySQBMAVrfYhhWZ8L5K8QrUg="; }; nativeBuildInputs = [ bison flex ]; @@ -17,8 +17,16 @@ stdenv.mkDerivation rec { doCheck = true; checkTarget = "tests"; - # Remove failing test-- mentions 'usr/bin' so probably related :) - preCheck = "rm -rf tests/017"; + postPatch = '' + # Fixup references to /usr/bin in tests + substituteInPlace tests/017/realpath.tl --replace /usr/bin /bin + substituteInPlace tests/017/realpath.expected --replace /usr/bin /bin + + substituteInPlace tests/018/process.tl --replace /usr/bin/env ${lib.getBin coreutils}/bin/env + ''; + + # Remove failing tests -- 018/chmod tries setting sticky bit + preCheck = "rm -rf tests/018/chmod*"; postInstall = '' d=$out/share/vim-plugins/txr |