From 705a8421971676551858284b7ebe10e360c5a50d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stanis=C5=82aw=20Pitucha?= Date: Sun, 18 Sep 2022 10:34:15 +1000 Subject: [PATCH] janet: build fixed on darwin --- .../janet/darwin-remove-net-test.patch | 20 ------------------- .../interpreters/janet/default.nix | 8 +------- 2 files changed, 1 insertion(+), 27 deletions(-) delete mode 100644 pkgs/development/interpreters/janet/darwin-remove-net-test.patch diff --git a/pkgs/development/interpreters/janet/darwin-remove-net-test.patch b/pkgs/development/interpreters/janet/darwin-remove-net-test.patch deleted file mode 100644 index b2a66d5465ea..000000000000 --- a/pkgs/development/interpreters/janet/darwin-remove-net-test.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/test/suite0009.janet b/test/suite0009.janet -index 6095bc60..25360d60 100644 ---- a/test/suite0009.janet -+++ b/test/suite0009.janet -@@ -174,15 +174,6 @@ - (defer (:close stream) - (check-matching-names stream))) - --# Test localname and peername --(repeat 20 -- (with [s (net/server "127.0.0.1" "8000" names-handler)] -- (defn test-names [] -- (with [conn (net/connect "127.0.0.1" "8000")] -- (check-matching-names conn))) -- (repeat 20 (test-names))) -- (gccollect)) -- - # Create pipe - - (var pipe-counter 0) \ No newline at end of file diff --git a/pkgs/development/interpreters/janet/default.nix b/pkgs/development/interpreters/janet/default.nix index ec182705a37a..cb42276f7d4a 100644 --- a/pkgs/development/interpreters/janet/default.nix +++ b/pkgs/development/interpreters/janet/default.nix @@ -11,10 +11,6 @@ stdenv.mkDerivation rec { sha256 = "sha256-uGbaoWJAWbSQ7QkocU7gFZUiWb0GD8mtuO7V0sUXTv0="; }; - # This release fails the test suite on darwin, remove when debugged. - # See https://github.com/NixOS/nixpkgs/pull/150618 for discussion. - patches = lib.optionals stdenv.isDarwin ./darwin-remove-net-test.patch; - postPatch = '' substituteInPlace janet.1 \ --replace /usr/local/ $out/ @@ -29,7 +25,7 @@ stdenv.mkDerivation rec { doInstallCheck = true; installCheckPhase = '' - $out/bin/janet --help + $out/bin/janet -e '(+ 1 2 3)' ''; meta = with lib; { @@ -38,7 +34,5 @@ stdenv.mkDerivation rec { license = licenses.mit; maintainers = with maintainers; [ andrewchambers peterhoeg ]; platforms = platforms.all; - # Marked as broken when patch is applied, see comment above patch. - broken = stdenv.isDarwin; }; }