aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--flake.nix2
-rw-r--r--misc/pegtl.nix23
-rw-r--r--package.nix4
3 files changed, 1 insertions, 28 deletions
diff --git a/flake.nix b/flake.nix
index 1fc02a590..cec970974 100644
--- a/flake.nix
+++ b/flake.nix
@@ -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