Skip to content

Commit 3993d70

Browse files
authored
mono: 6.12.0.182 -> 6.14.1 (#401409)
2 parents 66b5a5f + b0319a9 commit 3993d70

File tree

4 files changed

+45
-22
lines changed

4 files changed

+45
-22
lines changed

pkgs/development/compilers/mono/4.nix

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
callPackage,
33
stdenv,
44
lib,
5+
fetchurl,
56
}:
67

7-
callPackage ./generic.nix {
8+
callPackage ./generic.nix rec {
89
version = "4.8.1.0";
9-
sha256 = "1vyvp2g28ihcgxgxr8nhzyzdmzicsh5djzk8dk1hj5p5f2k3ijqq";
1010
enableParallelBuilding = false; # #32386, https://hydra.nixos.org/build/65600645
1111
extraPatches = lib.optionals stdenv.hostPlatform.isLinux [ ./mono4-glibc.patch ];
1212
env.NIX_CFLAGS_COMPILE = toString [
@@ -16,4 +16,8 @@ callPackage ./generic.nix {
1616
"-Wno-error=int-conversion"
1717
"-Wno-error=return-mismatch"
1818
];
19+
src = fetchurl {
20+
url = "https://download.mono-project.com/sources/mono/mono-${version}.tar.bz2";
21+
sha256 = "1vyvp2g28ihcgxgxr8nhzyzdmzicsh5djzk8dk1hj5p5f2k3ijqq";
22+
};
1923
}
Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,14 @@
11
{
22
callPackage,
3+
fetchurl,
34
}:
45

5-
callPackage ./generic.nix {
6+
callPackage ./generic.nix rec {
67
version = "5.20.1.34";
7-
sha256 = "12vw5dkhmp1vk9l658pil8jiqirkpdsc5z8dm5mpj595yr6d94fd";
88
enableParallelBuilding = true;
99
env.NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types -Wno-error=implicit-function-declaration";
10+
src = fetchurl {
11+
url = "https://download.mono-project.com/sources/mono/mono-${version}.tar.bz2";
12+
sha256 = "12vw5dkhmp1vk9l658pil8jiqirkpdsc5z8dm5mpj595yr6d94fd";
13+
};
1014
}
Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,21 @@
11
{
22
callPackage,
3+
fetchurl,
4+
fetchpatch,
35
}:
46

5-
callPackage ./generic.nix {
6-
version = "6.12.0.182";
7-
srcArchiveSuffix = "tar.xz";
8-
sha256 = "sha256-VzZqarTztezxEdSFSAMWFbOhANuHxnn8AG6Mik79lCQ=";
9-
enableParallelBuilding = true;
7+
callPackage ./generic.nix rec {
8+
version = "6.14.1";
9+
src = fetchurl {
10+
url = "https://dl.winehq.org/mono/sources/mono/mono-${version}.tar.xz";
11+
hash = "sha256-MCTJfAvIy81hHEAdX5lFKHBBCM6zHzGyjepHgwBNCCA=";
12+
};
13+
extraPatches = [
14+
# https://gitlab.winehq.org/mono/mono/-/merge_requests/101
15+
# fixes a pointer cast on aarch64 that causes crashes
16+
(fetchpatch {
17+
url = "https://gitlab.winehq.org/mono/mono/-/commit/2224c6915a98f870cc9a3a9f9e3698e7b20e3d27.patch";
18+
hash = "sha256-qyc3t1OyDzWBSnNW+W2YpdgFfTBs1Ew13jwdGKs09u0=";
19+
})
20+
];
1021
}

pkgs/development/compilers/mono/generic.nix

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
{
22
lib,
33
stdenv,
4-
fetchurl,
54
bison,
65
pkg-config,
76
glib,
@@ -15,27 +14,21 @@
1514
cacert,
1615
python3,
1716
version,
18-
sha256,
17+
src,
1918
autoconf,
2019
libtool,
2120
automake,
2221
cmake,
2322
which,
2423
gnumake42,
2524
enableParallelBuilding ? true,
26-
srcArchiveSuffix ? "tar.bz2",
2725
extraPatches ? [ ],
2826
env ? { },
2927
}:
3028

31-
stdenv.mkDerivation rec {
29+
stdenv.mkDerivation (finalAttrs: {
3230
pname = "mono";
33-
inherit version env;
34-
35-
src = fetchurl {
36-
inherit sha256;
37-
url = "https://download.mono-project.com/sources/mono/${pname}-${version}.${srcArchiveSuffix}";
38-
};
31+
inherit version src env;
3932

4033
strictDeps = true;
4134
nativeBuildInputs = [
@@ -49,6 +42,7 @@ stdenv.mkDerivation rec {
4942
python3
5043
which
5144
gnumake42
45+
gettext
5246
];
5347
buildInputs = [
5448
glib
@@ -113,12 +107,22 @@ stdenv.mkDerivation rec {
113107
(
114108
stdenv.hostPlatform.isDarwin
115109
&& stdenv.hostPlatform.isAarch64
116-
&& lib.versionOlder version "6.12.0.129"
110+
&& lib.versionOlder finalAttrs.version "6.12.0.129"
117111
)
118112
|| !stdenv.buildPlatform.canExecute stdenv.hostPlatform;
119-
homepage = "https://mono-project.com/";
113+
homepage =
114+
if lib.versionOlder finalAttrs.version "6.14.0" then
115+
"https://mono-project.com/"
116+
else
117+
"https://gitlab.winehq.org/mono/mono";
120118
description = "Cross platform, open source .NET development framework";
121119
platforms = with platforms; darwin ++ linux;
120+
knownVulnerabilities = lib.optionals (lib.versionOlder finalAttrs.version "6.14.0") [
121+
''
122+
mono was archived upstream, see https://www.mono-project.com/
123+
While WineHQ has taken over development, consider using 6.14.0 or newer.
124+
''
125+
];
122126
maintainers = with maintainers; [
123127
thoughtpolice
124128
obadz
@@ -142,4 +146,4 @@ stdenv.mkDerivation rec {
142146
];
143147
mainProgram = "mono";
144148
};
145-
}
149+
})

0 commit comments

Comments
 (0)