about summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorAnderson Torres <torres.anderson.85@protonmail.com>2022-12-31 09:57:39 -0300
committerGitHub <noreply@github.com>2022-12-31 09:57:39 -0300
commit30fe9f0b6ad5bdec6e46b3d121db7b45105b1b66 (patch)
tree45bb1896f695bd04a271c5b7268a75dd1352b1be /pkgs
parent0368a925766b76b5af68eb1de9d90eb6aa842ae2 (diff)
parent7f37b4b22a284bca468cfde00eb3dc10077b9061 (diff)
Merge pull request #208486 from atorres1985-contrib/small-fixups
txr: 283 -> 284
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/tools/text/txr/default.nix19
1 files changed, 13 insertions, 6 deletions
diff --git a/pkgs/tools/text/txr/default.nix b/pkgs/tools/text/txr/default.nix
index d36d1bef03698..fd375d6b44d0b 100644
--- a/pkgs/tools/text/txr/default.nix
+++ b/pkgs/tools/text/txr/default.nix
@@ -7,11 +7,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "txr";
-  version = "283";
+  version = "284";
 
   src = fetchurl {
     url = "http://www.kylheku.com/cgit/txr/snapshot/txr-${finalAttrs.version}.tar.bz2";
-    hash = "sha256-2TnwxHAiiWEytHpKXrEwQ+ajq19f0lv7ss842kkPs4Y=";
+    hash = "sha256-dlAOThO2sJspkSYmR927iu13y3XRSllIGVh7ufu8ROU=";
   };
 
   buildInputs = [ libffi ];
@@ -28,9 +28,15 @@ stdenv.mkDerivation (finalAttrs: {
     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*
+  preCheck = let
+    disabledTests = lib.concatStringsSep " " [
+      # - tries to set sticky bits
+      "tests/018/chmod.tl"
+      # - warning: unbound function crypt
+      "tests/018/crypt.tl"
+    ];
+  in ''
+    rm ${disabledTests}
   '';
 
   # TODO: ship vim plugin separately?
@@ -46,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: {
   '';
 
   meta = with lib; {
-    homepage = "http://nongnu.org/txr";
+    homepage = "https://nongnu.org/txr";
     description = "An Original, New Programming Language for Convenient Data Munging";
     longDescription = ''
       TXR is a general-purpose, multi-paradigm programming language. It
@@ -58,6 +64,7 @@ stdenv.mkDerivation (finalAttrs: {
       at the command line, to data scanning and extracting scripts, to full
       application development in a wide range of areas.
     '';
+    changelog = "https://www.kylheku.com/cgit/txr/tree/RELNOTES?h=txr-${finalAttrs.version}";
     license = licenses.bsd2;
     maintainers = with lib.maintainers; [ AndersonTorres dtzWill ];
     platforms = platforms.all;