Merge pull request #191721 from viraptor/janet-darwin-fix
janet: build fixed on darwin
This commit is contained in:
commit
7d44c406f2
2 changed files with 1 additions and 27 deletions
|
@ -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)
|
|
|
@ -11,10 +11,6 @@ stdenv.mkDerivation rec {
|
||||||
sha256 = "sha256-uGbaoWJAWbSQ7QkocU7gFZUiWb0GD8mtuO7V0sUXTv0=";
|
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 = ''
|
postPatch = ''
|
||||||
substituteInPlace janet.1 \
|
substituteInPlace janet.1 \
|
||||||
--replace /usr/local/ $out/
|
--replace /usr/local/ $out/
|
||||||
|
@ -29,7 +25,7 @@ stdenv.mkDerivation rec {
|
||||||
doInstallCheck = true;
|
doInstallCheck = true;
|
||||||
|
|
||||||
installCheckPhase = ''
|
installCheckPhase = ''
|
||||||
$out/bin/janet --help
|
$out/bin/janet -e '(+ 1 2 3)'
|
||||||
'';
|
'';
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
|
@ -38,7 +34,5 @@ stdenv.mkDerivation rec {
|
||||||
license = licenses.mit;
|
license = licenses.mit;
|
||||||
maintainers = with maintainers; [ andrewchambers peterhoeg ];
|
maintainers = with maintainers; [ andrewchambers peterhoeg ];
|
||||||
platforms = platforms.all;
|
platforms = platforms.all;
|
||||||
# Marked as broken when patch is applied, see comment above patch.
|
|
||||||
broken = stdenv.isDarwin;
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue