Skip to content
This repository was archived by the owner on Mar 21, 2025. It is now read-only.

Commit 054ebf0

Browse files
committed
feat: update active versions and archive olders
1 parent 34321d5 commit 054ebf0

File tree

4 files changed

+28
-14
lines changed

4 files changed

+28
-14
lines changed

src/makePhpPackage.nix

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,9 @@ let
120120
# the SOAP extension requires the `session` extension.
121121
soap = prevPO.extensions.soap.overrideAttrs (attrs: {
122122
internalDeps = attrs.internalDeps or [ ] ++ [ prevPO.extensions.session ];
123+
# Remove soap patch as it has been upstreamed
124+
# See https://github.com/NixOS/nixpkgs/pull/358196 (fix soap test)
125+
patches = if (lib.versionAtLeast prevPO.php.version "8.3") then [] else (attrs.patches or []);
123126
});
124127

125128
sockets = prevPO.extensions.sockets.overrideAttrs (attrs: {

src/overlays/active.nix

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -34,22 +34,18 @@ let
3434

3535
versions = [
3636
{
37-
version = "8.1.28";
38-
hash = "sha256-i+RQCW4BU8R9dThOfdWVzIl/HVPOAGBwjOlYm8wxQe4=";
39-
patches = {
40-
php = [ patches.libxmlpatch ];
41-
};
42-
cflags = " -Wno-compare-distinct-pointer-types -Wno-implicit-const-int-float-conversion -Wno-deprecated-declarations -Wno-incompatible-function-pointer-types -Wno-incompatible-pointer-types-discards-qualifiers";
37+
version = "8.1.31";
38+
hash = "sha256-CzmCizRRUcrxt5XZ9LkjyYhyMXdsMwdt/J2QpEOQ0Nw=";
4339
extensions = extensions.php81-to-php8300;
4440
}
4541
{
46-
version = "8.2.19";
47-
hash = "sha256-PBj3zlG3x7JreX4flwedOGswNH6wToF/XmyOmydeKmo=";
42+
version = "8.2.27";
43+
hash = "sha256-blfbr3aafz3rTw9IuMU15nHMChgCLtf2/yO1DpQdS2A=";
4844
extensions = extensions.php81-to-php8300;
4945
}
5046
{
51-
version = "8.3.7";
52-
hash = "sha256-AcIM3hxaVpZlGHXtIvUHhJZ5+6dA+MQhYWt9Q9f3l9o=";
47+
version = "8.3.15";
48+
hash = "sha256-sWdaT/cwtYEbjmp2h0iMQug14Vapl3aqPm8Ber2jvpg=";
5349
extensions = extensions.php81-to-php8300;
5450
}
5551
{

src/overlays/archive.nix

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -167,6 +167,15 @@ let
167167
cflags = " -Wno-compare-distinct-pointer-types -Wno-implicit-const-int-float-conversion -Wno-deprecated-declarations -Wno-incompatible-function-pointer-types -Wno-incompatible-pointer-types-discards-qualifiers";
168168
extensions = extensions.php81-to-php8300;
169169
}
170+
{
171+
version = "8.1.28";
172+
hash = "sha256-i+RQCW4BU8R9dThOfdWVzIl/HVPOAGBwjOlYm8wxQe4=";
173+
patches = {
174+
php = [ patches.libxmlpatch patches.ext_dom_tests ];
175+
};
176+
cflags = " -Wno-compare-distinct-pointer-types -Wno-implicit-const-int-float-conversion -Wno-deprecated-declarations -Wno-incompatible-function-pointer-types -Wno-incompatible-pointer-types-discards-qualifiers";
177+
extensions = extensions.php81-to-php8300;
178+
}
170179

171180
{
172181
version = "8.2.5";
@@ -315,6 +324,11 @@ let
315324
hash = "sha256-GRMWwgMmfZYWC0fSL5VdTcEXk96KXzJ+DCp2J1polOo=";
316325
extensions = extensions.php81-to-php8300;
317326
}
327+
{
328+
version = "8.2.19";
329+
hash = "sha256-PBj3zlG3x7JreX4flwedOGswNH6wToF/XmyOmydeKmo=";
330+
extensions = extensions.php81-to-php8300;
331+
}
318332

319333
{
320334
version = "8.3.0";
@@ -353,6 +367,11 @@ let
353367
hash = "sha256-PFyvGODAokOq7JE6OeywkgQxla3eTD/ELpRdpbkndpU=";
354368
extensions = extensions.php81-to-php8300;
355369
}
370+
{
371+
version = "8.3.7";
372+
hash = "sha256-AcIM3hxaVpZlGHXtIvUHhJZ5+6dA+MQhYWt9Q9f3l9o=";
373+
extensions = extensions.php81-to-php8300;
374+
}
356375
];
357376
in
358377
lib.mapAttrs (k: v: ((makePhpPackage v).withExtensions (v.extensions))) (makePackageSet versions)

src/overlays/snapshot.nix

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,6 @@ let
1414
php-8-1-snapshot = {
1515
version = "8.1.999-${inputs.php-src-81.shortRev}";
1616
src = inputs.php-src-81;
17-
patches = {
18-
php = [ patches.libxmlpatch ];
19-
};
20-
cflags = " -Wno-compare-distinct-pointer-types -Wno-implicit-const-int-float-conversion -Wno-deprecated-declarations -Wno-incompatible-function-pointer-types -Wno-incompatible-pointer-types-discards-qualifiers";
2117
extensions = extensions.php81-to-php8300;
2218
};
2319
php-8-2-snapshot = {

0 commit comments

Comments
 (0)