diff --git a/README.md b/README.md index bcbc07a..558002a 100644 --- a/README.md +++ b/README.md @@ -62,7 +62,6 @@ building those PHP packages yourself. ```shell cachix use nix-shell -cachix use php-src-nix ``` This project also provides a basic template for PHP projects, to use it, run: diff --git a/flake.lock b/flake.lock index a44fe56..ba36d6e 100644 --- a/flake.lock +++ b/flake.lock @@ -18,11 +18,11 @@ "flake-compat_2": { "flake": false, "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "lastModified": 1732722421, + "narHash": "sha256-HRJ/18p+WoXpWJkcdsk9St5ZiukCqSDgbOGFa8Okehg=", "owner": "edolstra", "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "rev": "9ed2ac151eada2306ca8c418ebd97807bb08f6ac", "type": "github" }, "original": { @@ -36,28 +36,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1719994518, - "narHash": "sha256-pQMhCCHyQGRzdfAkdJ4cIWiw+JNuWsTX7f0ZYSyz0VY=", + "lastModified": 1730504689, + "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "9227223f6d922fee3c7b190b2cc238a99527bbb7", - "type": "github" - }, - "original": { - "id": "flake-parts", - "type": "indirect" - } - }, - "flake-parts_2": { - "inputs": { - "nixpkgs-lib": "nixpkgs-lib_2" - }, - "locked": { - "lastModified": 1719994518, - "narHash": "sha256-pQMhCCHyQGRzdfAkdJ4cIWiw+JNuWsTX7f0ZYSyz0VY=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "9227223f6d922fee3c7b190b2cc238a99527bbb7", + "rev": "506278e768c2a08bec68eb62932193e341f55c90", "type": "github" }, "original": { @@ -72,11 +55,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1720691436, - "narHash": "sha256-ECgcdTCu2tP3eMd8/Tanf8ZP7so5KXqY0GR8UaFH7bg=", + "lastModified": 1733037908, + "narHash": "sha256-Fc2SmYq4mwUeRSBY1Xjveoehv738/0/6d+Mo1d/DRm4=", "owner": "fossar", "repo": "nix-phps", - "rev": "5c2a9bf0246b7f38b7ca737f0f1f36d5b45ae15a", + "rev": "7d978a94134c2b39a20b48526cfe1a57ff29fa43", "type": "github" }, "original": { @@ -87,11 +70,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1719468428, - "narHash": "sha256-vN5xJAZ4UGREEglh3lfbbkIj+MPEYMuqewMn4atZFaQ=", + "lastModified": 1732937961, + "narHash": "sha256-B5pYT+IVaqcrfOekkwKvx/iToDnuQWzc2oyDxzzBDc4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1e3deb3d8a86a870d925760db1a5adecc64d329d", + "rev": "4703b8d2c708e13a8cab03d865f90973536dcdf5", "type": "github" }, "original": { @@ -103,51 +86,23 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1719876945, - "narHash": "sha256-Fm2rDDs86sHy0/1jxTOKB1118Q0O3Uc7EC0iXvXKpbI=", + "lastModified": 1730504152, + "narHash": "sha256-lXvH/vOfb4aGYyvFmZK/HlsNsr/0CVWlwYvo2rxJk3s=", "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/5daf0514482af3f97abaefc78a6606365c9108e2.tar.gz" + "url": "https://github.com/NixOS/nixpkgs/archive/cc2f28000298e1269cea6612cd06ec9979dd5d7f.tar.gz" }, "original": { "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/5daf0514482af3f97abaefc78a6606365c9108e2.tar.gz" - } - }, - "nixpkgs-lib_2": { - "locked": { - "lastModified": 1719876945, - "narHash": "sha256-Fm2rDDs86sHy0/1jxTOKB1118Q0O3Uc7EC0iXvXKpbI=", - "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/5daf0514482af3f97abaefc78a6606365c9108e2.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/5daf0514482af3f97abaefc78a6606365c9108e2.tar.gz" + "url": "https://github.com/NixOS/nixpkgs/archive/cc2f28000298e1269cea6612cd06ec9979dd5d7f.tar.gz" } }, "nixpkgs_2": { "locked": { - "lastModified": 1722141560, - "narHash": "sha256-Ul3rIdesWaiW56PS/Ak3UlJdkwBrD4UcagCmXZR9Z7Y=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "038fb464fcfa79b4f08131b07f2d8c9a6bcc4160", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { - "locked": { - "lastModified": 1720955038, - "narHash": "sha256-GaliJqfFwyYxReFywxAa8orCO+EnDq2NK2F+5aSc8vo=", + "lastModified": 1733024928, + "narHash": "sha256-n/DOfpKH1vkukuBnach91QBQId2dr5tkE7/7UrkV2zw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "aa247c0c90ecf4ae7a032c54fdc21b91ca274062", + "rev": "2c27ab2e60502d1ebb7cf38909de38663f762a79", "type": "github" }, "original": { @@ -157,106 +112,13 @@ "type": "github" } }, - "php-src-81": { - "flake": false, - "locked": { - "lastModified": 1717566497, - "narHash": "sha256-LvgGu6AzaIsWtZpYm//IZoPM/upyI5FNZ7KXS2kkZkM=", - "owner": "php", - "repo": "php-src", - "rev": "a87ccc7ca2644e327c210e68b4d98df98ad33523", - "type": "github" - }, - "original": { - "owner": "php", - "ref": "PHP-8.1", - "repo": "php-src", - "type": "github" - } - }, - "php-src-82": { - "flake": false, - "locked": { - "lastModified": 1720953997, - "narHash": "sha256-bGJgctaNaWc9ECi+0/o1KmkDI0onCtHBCkB1B5hEvqU=", - "owner": "php", - "repo": "php-src", - "rev": "6d0db528962bb29df71a368aa4dbfa10511b5418", - "type": "github" - }, - "original": { - "owner": "php", - "ref": "PHP-8.2", - "repo": "php-src", - "type": "github" - } - }, - "php-src-83": { - "flake": false, - "locked": { - "lastModified": 1720957189, - "narHash": "sha256-lfJuW4ped4XeyaVY9HozPOjWU6HGP4Z/m1RFsVlmwQQ=", - "owner": "php", - "repo": "php-src", - "rev": "02a60be24d80484aa59d0f55f2a8da77faafe3b9", - "type": "github" - }, - "original": { - "owner": "php", - "ref": "PHP-8.3", - "repo": "php-src", - "type": "github" - } - }, - "php-src-master": { - "flake": false, - "locked": { - "lastModified": 1720990345, - "narHash": "sha256-1k4H8pFxT0wsmNCtymnttuyDEouv7zS3iS5ihpPhEHk=", - "owner": "php", - "repo": "php-src", - "rev": "85b7181d7dd6e155a74d0392e1fd20e41b9768a1", - "type": "github" - }, - "original": { - "owner": "php", - "ref": "master", - "repo": "php-src", - "type": "github" - } - }, - "php-src-nix": { - "inputs": { - "flake-parts": "flake-parts_2", - "nixpkgs": "nixpkgs_3", - "php-src-81": "php-src-81", - "php-src-82": "php-src-82", - "php-src-83": "php-src-83", - "php-src-master": "php-src-master", - "systems": "systems_2" - }, - "locked": { - "lastModified": 1721010431, - "narHash": "sha256-kBCRGNJCvpAmusajnCO0/jSx4Cy684wzZ4rDo/tkj8k=", - "owner": "loophp", - "repo": "php-src-nix", - "rev": "917fae8d800a493d128c4263e40245817e0cfee6", - "type": "github" - }, - "original": { - "owner": "loophp", - "repo": "php-src-nix", - "type": "github" - } - }, "root": { "inputs": { "flake-compat": "flake-compat", "flake-parts": "flake-parts", "nix-phps": "nix-phps", "nixpkgs": "nixpkgs_2", - "php-src-nix": "php-src-nix", - "systems": "systems_3" + "systems": "systems_2" } }, "systems": { @@ -289,31 +151,16 @@ "type": "github" } }, - "systems_3": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "utils": { "inputs": { "systems": "systems" }, "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "owner": "numtide", "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index a985003..16310bc 100644 --- a/flake.nix +++ b/flake.nix @@ -4,7 +4,6 @@ inputs = { nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; nix-phps.url = "github:fossar/nix-phps"; - php-src-nix.url = "github:loophp/php-src-nix"; # Shim to make flake.nix work with stable Nix. flake-compat.url = "github:nix-community/flake-compat"; systems.url = "github:nix-systems/default"; @@ -33,10 +32,7 @@ perSystem = { self', - inputs', - config, pkgs, - system, lib, ... }: diff --git a/src/overlay/phps.nix b/src/overlay/phps.nix index a9fad6f..8ae677a 100644 --- a/src/overlay/phps.nix +++ b/src/overlay/phps.nix @@ -5,7 +5,6 @@ final: prev: let buildPhpFromComposer = (inputs.self.overlays.default final prev).api.buildPhpFromComposer; nix-phps = inputs.nix-phps.overlays.default final prev; - php-src-nix-snapshot = inputs.php-src-nix.overlays.snapshot final prev; in builtins.mapAttrs ( name: value: @@ -13,5 +12,4 @@ builtins.mapAttrs ( php = value; src = inputs.self; } -) php-src-nix-snapshot -// nix-phps +) nix-phps