pyrox.dev
Merge pull request #141069 from dywedir/unison
unison: 2.51.3 -> 2.51.4
authored by
Maximilian Bosch
and committed by
GitHub
85166a71
1fa5e13f
+2
-13
pkgs/applications/networking/sync/unison/default.nix
+2
-13
pkgs/applications/networking/sync/unison/default.nix
···
7
7
, makeWrapper
8
8
, ncurses
9
9
, gnugrep
10
-
, fetchpatch
11
10
, copyDesktopItems
12
11
, makeDesktopItem
13
12
, enableX11 ? true
···
15
14
16
15
stdenv.mkDerivation rec {
17
16
pname = "unison";
18
-
version = "2.51.3";
17
+
version = "2.51.4";
19
18
20
19
src = fetchFromGitHub {
21
20
owner = "bcpierce00";
22
21
repo = "unison";
23
22
rev = "v${version}";
24
-
sha256 = "sha256-42hmdMwOYSWGiDCmhuqtpCWtvtyD2l+kA/bhHD/Qh5Y=";
23
+
sha256 = "sha256-jcfq4X+r98bQqbQ3gRqJyryLdt1Y/2CLawqqIiUaQOo=";
25
24
};
26
25
27
26
nativeBuildInputs = [ makeWrapper ]
28
27
++ lib.optional enableX11 copyDesktopItems;
29
28
buildInputs = [ ocamlPackages.ocaml ncurses ];
30
-
31
-
patches = [
32
-
# Patch to fix build with ocaml 4.12. Remove in 2.51.4
33
-
# https://github.com/bcpierce00/unison/pull/481
34
-
(fetchpatch {
35
-
name = "fix-compile-with-ocaml-4.12.patch";
36
-
url = "https://github.com/bcpierce00/unison/commit/14b885316e0a4b41cb80fe3daef7950f88be5c8f.patch?full_index=1";
37
-
sha256 = "0j1rma1cwdsfql19zvzhfj2ys5c4lbhjcp6jrnck04xnckxxiy3d";
38
-
})
39
-
];
40
29
41
30
preBuild = lib.optionalString enableX11 ''
42
31
sed -i "s|\(OCAMLOPT=.*\)$|\1 -I $(echo "${ocamlPackages.lablgtk}"/lib/ocaml/*/site-lib/lablgtk2)|" src/Makefile.OCaml