From 393794ad92f64a3a611b75dbab4920b9b042b75a Mon Sep 17 00:00:00 2001 From: vigress8 Date: Fri, 26 Jul 2024 10:43:24 +0400 Subject: update flake.lock Change-Id: I7afb53c929d297061dba6ec4a3ec7c6e3c6a553e --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index a3306f941..84e578bc3 100644 --- a/flake.lock +++ b/flake.lock @@ -19,11 +19,11 @@ "nix2container": { "flake": false, "locked": { - "lastModified": 1712990762, - "narHash": "sha256-hO9W3w7NcnYeX8u8cleHiSpK2YJo7ecarFTUlbybl7k=", + "lastModified": 1720642556, + "narHash": "sha256-qsnqk13UmREKmRT7c8hEnz26X3GFFyIQrqx4EaRc1Is=", "owner": "nlewo", "repo": "nix2container", - "rev": "20aad300c925639d5d6cbe30013c8357ce9f2a2e", + "rev": "3853e5caf9ad24103b13aa6e0e8bcebb47649fe4", "type": "github" }, "original": { @@ -34,11 +34,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1718111384, - "narHash": "sha256-7tSst0S5FOmcgvNtfy6cjZX5w8CabCVAfAeCkhY4OVg=", + "lastModified": 1721931987, + "narHash": "sha256-1Zg8LY0T5EfXtv0Kf4M6SFnjH7Eto4VV+EKJ/YSnhiI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a508a44af0c1b1b57785c34d8b54783536273eeb", + "rev": "e21630230c77140bc6478a21cd71e8bb73706fce", "type": "github" }, "original": { @@ -67,11 +67,11 @@ "pre-commit-hooks": { "flake": false, "locked": { - "lastModified": 1712055707, - "narHash": "sha256-4XLvuSIDZJGS17xEwSrNuJLL7UjDYKGJSbK1WWX2AK8=", + "lastModified": 1721042469, + "narHash": "sha256-6FPUl7HVtvRHCCBQne7Ylp4p+dpP3P/OYuzjztZ4s70=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "e35aed5fda3cc79f88ed7f1795021e559582093a", + "rev": "f451c19376071a90d8c58ab1a953c6e9840527fd", "type": "github" }, "original": { -- cgit v1.2.3 From a98dce2a1f6b51374cc596985ef929b372cec763 Mon Sep 17 00:00:00 2001 From: vigress8 Date: Fri, 26 Jul 2024 10:43:48 +0400 Subject: devendor pegtl Change-Id: I609a58985fc5210806d0959049a48976ae079c30 --- flake.nix | 2 -- misc/pegtl.nix | 23 ----------------------- package.nix | 4 +--- 3 files changed, 1 insertion(+), 28 deletions(-) delete mode 100644 misc/pegtl.nix 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 -- cgit v1.2.3