diff options
author | vigress8 <vig@disroot.org> | 2024-07-26 10:43:48 +0400 |
---|---|---|
committer | vigress8 <vig@disroot.org> | 2024-07-26 11:22:34 +0400 |
commit | a98dce2a1f6b51374cc596985ef929b372cec763 (patch) | |
tree | f66427d441a839733b627a721e401808ee2843cf | |
parent | 393794ad92f64a3a611b75dbab4920b9b042b75a (diff) |
devendor pegtl
Change-Id: I609a58985fc5210806d0959049a48976ae079c30
-rw-r--r-- | flake.nix | 2 | ||||
-rw-r--r-- | misc/pegtl.nix | 23 | ||||
-rw-r--r-- | package.nix | 4 |
3 files changed, 1 insertions, 28 deletions
@@ -196,8 +196,6 @@ busybox-sandbox-shell = final.busybox-sandbox-shell or final.default-busybox-sandbox-shell; }; - pegtl = final.nix.passthru.pegtl; - # Export the patched version of boehmgc that Lix uses into the overlay # for consumers of this flake. boehmgc-nix = final.nix.passthru.boehmgc-nix; diff --git a/misc/pegtl.nix b/misc/pegtl.nix deleted file mode 100644 index 3fd999d9d..000000000 --- a/misc/pegtl.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ - stdenv, - cmake, - ninja, - fetchFromGitHub, -}: - -stdenv.mkDerivation { - pname = "pegtl"; - version = "3.2.7"; - - src = fetchFromGitHub { - repo = "PEGTL"; - owner = "taocpp"; - rev = "refs/tags/3.2.7"; - hash = "sha256-IV5YNGE4EWVrmg2Sia/rcU8jCuiBynQGJM6n3DCWTQU="; - }; - - nativeBuildInputs = [ - cmake - ninja - ]; -} diff --git a/package.nix b/package.nix index e5e0033df..61015bac9 100644 --- a/package.nix +++ b/package.nix @@ -35,7 +35,7 @@ meson, ninja, openssl, - pegtl ? __forDefaults.pegtl, + pegtl, pkg-config, python3, rapidcheck, @@ -70,8 +70,6 @@ lix-doc = callPackage ./lix-doc/package.nix { }; build-release-notes = callPackage ./maintainers/build-release-notes.nix { }; - - pegtl = callPackage ./misc/pegtl.nix { }; }, }: let |