diff options
| author | Vladyslav M <dywedir@gra.red> | 2021-10-09 08:23:01 +0300 |
|---|---|---|
| committer | Vladyslav M <dywedir@gra.red> | 2021-10-17 18:18:47 +0300 |
| commit | cdc00b198c7ad9ac96929f7baa6b9fc46e453d92 (patch) | |
| tree | db424fbc493419c7d358fb6cefaed0fd36f906cb /pkgs/applications/networking/sync/unison/default.nix | |
| parent | 2c2867dddeb4e12fa2005bb7600b58111bcd0fb4 (diff) | |
| download | nixpkgs-cdc00b198c7ad9ac96929f7baa6b9fc46e453d92.tar nixpkgs-cdc00b198c7ad9ac96929f7baa6b9fc46e453d92.tar.gz nixpkgs-cdc00b198c7ad9ac96929f7baa6b9fc46e453d92.tar.bz2 nixpkgs-cdc00b198c7ad9ac96929f7baa6b9fc46e453d92.tar.lz nixpkgs-cdc00b198c7ad9ac96929f7baa6b9fc46e453d92.tar.xz nixpkgs-cdc00b198c7ad9ac96929f7baa6b9fc46e453d92.tar.zst nixpkgs-cdc00b198c7ad9ac96929f7baa6b9fc46e453d92.zip | |
unison: 2.51.3 -> 2.51.4
Diffstat (limited to 'pkgs/applications/networking/sync/unison/default.nix')
| -rw-r--r-- | pkgs/applications/networking/sync/unison/default.nix | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/pkgs/applications/networking/sync/unison/default.nix b/pkgs/applications/networking/sync/unison/default.nix index b106deb074e..429042f3ee4 100644 --- a/pkgs/applications/networking/sync/unison/default.nix +++ b/pkgs/applications/networking/sync/unison/default.nix @@ -7,7 +7,6 @@ , makeWrapper , ncurses , gnugrep -, fetchpatch , copyDesktopItems , makeDesktopItem , enableX11 ? true @@ -15,29 +14,19 @@ stdenv.mkDerivation rec { pname = "unison"; - version = "2.51.3"; + version = "2.51.4"; src = fetchFromGitHub { owner = "bcpierce00"; repo = "unison"; rev = "v${version}"; - sha256 = "sha256-42hmdMwOYSWGiDCmhuqtpCWtvtyD2l+kA/bhHD/Qh5Y="; + sha256 = "sha256-jcfq4X+r98bQqbQ3gRqJyryLdt1Y/2CLawqqIiUaQOo="; }; nativeBuildInputs = [ makeWrapper ] ++ lib.optional enableX11 copyDesktopItems; buildInputs = [ ocamlPackages.ocaml ncurses ]; - patches = [ - # Patch to fix build with ocaml 4.12. Remove in 2.51.4 - # https://github.com/bcpierce00/unison/pull/481 - (fetchpatch { - name = "fix-compile-with-ocaml-4.12.patch"; - url = "https://github.com/bcpierce00/unison/commit/14b885316e0a4b41cb80fe3daef7950f88be5c8f.patch?full_index=1"; - sha256 = "0j1rma1cwdsfql19zvzhfj2ys5c4lbhjcp6jrnck04xnckxxiy3d"; - }) - ]; - preBuild = lib.optionalString enableX11 '' sed -i "s|\(OCAMLOPT=.*\)$|\1 -I $(echo "${ocamlPackages.lablgtk}"/lib/ocaml/*/site-lib/lablgtk2)|" src/Makefile.OCaml '' + '' |