diff --git a/flake.lock b/flake.lock index 0ea08ba43..76c2f5a8e 100644 --- a/flake.lock +++ b/flake.lock @@ -1,43 +1,43 @@ { "nodes": { "nixpkgs": { "locked": { - "lastModified": 1651114127, - "narHash": "sha256-/lLC0wkMZkAdA5e1W76SnJzbhfOGDvync3VRHJMtAKk=", + "lastModified": 1655481042, + "narHash": "sha256-XHbcywq2vIQ5CeH1OK3TN793jkiNAAZsSctS1PFgseo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "6766fb6503ae1ebebc2a9704c162b2aef351f921", + "rev": "103a4c0ae46afa9cf008c30744175315ca38e9f9", "type": "github" }, "original": { "owner": "nixos", "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } }, "root": { "inputs": { "nixpkgs": "nixpkgs", "utils": "utils" } }, "utils": { "locked": { "lastModified": 1638122382, "narHash": "sha256-sQzZzAbvKEqN9s0bzWuYmRaA03v40gaJ4+iL1LXjaeI=", "owner": "numtide", "repo": "flake-utils", "rev": "74f7e4319258e287b0f9cb95426c9853b282730b", "type": "github" }, "original": { "owner": "numtide", "repo": "flake-utils", "type": "github" } } }, "root": "root", "version": 7 } diff --git a/nix/overlay.nix b/nix/overlay.nix index 376f79f69..688fc2bb7 100644 --- a/nix/overlay.nix +++ b/nix/overlay.nix @@ -1,23 +1,29 @@ # An overlay allows for a package set to be extended with new or modified packages # `final` refers to the package set with all overlays applied. # This allows for added or modified packages to be referenced with # all relevant changes final: # `prev` refers to the previous package set before this current overlay is applied. # This is cheaper for nix to evaluate, thus should be prefered over final when possible. prev: { # add packages meant for just this repository amqp-cpp = prev.callPackage ./amqp-cpp.nix { }; protobuf_3_15_cmake = prev.callPackage ./protobuf_3_15.nix { }; devShell = final.callPackage ./dev-shell.nix { }; mysql-down = prev.callPackage ./mysql-down-linux.nix { }; mysql-up = prev.callPackage ./mysql-up-linux.nix { }; + + arcanist = prev.arcanist.override(_: { + # php8.1 will cause warnings to throw as exceptions + # around calling strlen() with null + php = prev.php80; + }); }