pyrox.dev
mcrypt: unbreak on GCC 14, modernize (#388546)
authored by Arne Keller and committed by GitHub 6b40448a b4d421fd
+5
-5
pkgs/by-name/li/libmcrypt/package.nix
+5
-5
pkgs/by-name/li/libmcrypt/package.nix
···
6
6
disablePosixThreads ? false,
7
7
}:
8
8
9
-
stdenv.mkDerivation rec {
9
+
stdenv.mkDerivation (finalAttrs: {
10
10
pname = "libmcrypt";
11
11
version = "2.5.8";
12
12
13
13
src = fetchurl {
14
-
url = "mirror://sourceforge/mcrypt/Libmcrypt/${version}/libmcrypt-${version}.tar.gz";
15
-
sha256 = "0gipgb939vy9m66d3k8il98rvvwczyaw2ixr8yn6icds9c3nrsz4";
14
+
url = "mirror://sourceforge/mcrypt/Libmcrypt/${finalAttrs.version}/libmcrypt-${finalAttrs.version}.tar.gz";
15
+
hash = "sha256-5OtsB0u6sWisR7lHwZX/jO+dUaIRzdGMqcnvNNJ6Nz4=";
16
16
};
17
17
18
18
buildInputs = lib.optional stdenv.hostPlatform.isDarwin cctools;
···
34
34
description = "Replacement for the old crypt() package and crypt(1) command, with extensions";
35
35
mainProgram = "libmcrypt-config";
36
36
homepage = "https://mcrypt.sourceforge.net";
37
-
license = "GPL";
37
+
license = lib.licenses.lgpl21Plus;
38
38
platforms = lib.platforms.all;
39
39
};
40
-
}
40
+
})
+6
-8
pkgs/by-name/mc/mcrypt/package.nix
+6
-8
pkgs/by-name/mc/mcrypt/package.nix
···
6
6
libmhash,
7
7
}:
8
8
9
-
stdenv.mkDerivation rec {
9
+
stdenv.mkDerivation (finalAttrs: {
10
10
version = "2.6.8";
11
11
pname = "mcrypt";
12
12
13
13
src = fetchurl {
14
-
url = "mirror://sourceforge/mcrypt/MCrypt/${version}/mcrypt-${version}.tar.gz";
15
-
sha256 = "5145aa844e54cca89ddab6fb7dd9e5952811d8d787c4f4bf27eb261e6c182098";
14
+
url = "mirror://sourceforge/mcrypt/MCrypt/${finalAttrs.version}/mcrypt-${finalAttrs.version}.tar.gz";
15
+
hash = "sha256-UUWqhE5UzKid2rb7fdnllSgR2NeHxPS/J+smHmwYIJg=";
16
16
};
17
17
18
18
patches = [
···
28
28
libmhash
29
29
];
30
30
31
-
env = lib.optionalAttrs stdenv.cc.isClang {
32
-
NIX_CFLAGS_COMPILE = "-Wno-implicit-function-declaration";
33
-
};
31
+
env.NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration";
34
32
35
33
meta = {
36
34
description = "Replacement for old UNIX crypt(1)";
···
40
38
ever-wider range of algorithms and modes.
41
39
'';
42
40
homepage = "https://mcrypt.sourceforge.net";
43
-
license = lib.licenses.gpl3Only;
41
+
license = lib.licenses.gpl3Plus;
44
42
platforms = lib.platforms.all;
45
43
maintainers = [ lib.maintainers.qknight ];
46
44
};
47
-
}
45
+
})