unison: 2.53.5 -> 2.53.7 (#354120)

authored by

Austin Horstman and committed by
GitHub
0a187821 555f0e9f

+37 -26
+37 -26
pkgs/by-name/un/unison/package.nix
··· 1 - { lib 2 - , stdenv 3 - , fetchFromGitHub 4 - , ocamlPackages 5 - , copyDesktopItems 6 - , makeDesktopItem 7 - , wrapGAppsHook3 8 - , gsettings-desktop-schemas 9 - , enableX11 ? !stdenv.hostPlatform.isDarwin 1 + { 2 + lib, 3 + stdenv, 4 + fetchFromGitHub, 5 + ocamlPackages, 6 + copyDesktopItems, 7 + makeDesktopItem, 8 + wrapGAppsHook3, 9 + gsettings-desktop-schemas, 10 + enableX11 ? !stdenv.hostPlatform.isDarwin, 10 11 }: 11 12 12 13 stdenv.mkDerivation (finalAttrs: { 13 14 pname = "unison"; 14 - version = "2.53.5"; 15 + version = "2.53.7"; 15 16 16 17 src = fetchFromGitHub { 17 18 owner = "bcpierce00"; 18 19 repo = "unison"; 19 20 rev = "v${finalAttrs.version}"; 20 - hash = "sha256-XCdK38jG7tRI+/Zk72JVY8a/pPJF6KVaf8l2s3hgxLs="; 21 + hash = "sha256-QmYcxzsnbRDQdqkLh82OLWrLF6v3qzf1aOIcnz0kwEk="; 21 22 }; 22 23 23 24 strictDeps = true; 24 25 25 - # uimac requires xcode 26 - postPatch = '' 27 - sed -i -e 's/ macuimaybe//' src/Makefile 28 - ''; 26 + nativeBuildInputs = 27 + [ 28 + ocamlPackages.ocaml 29 + ocamlPackages.findlib 30 + ] 31 + ++ lib.optionals enableX11 [ 32 + copyDesktopItems 33 + wrapGAppsHook3 34 + ]; 35 + buildInputs = lib.optionals enableX11 [ 36 + gsettings-desktop-schemas 37 + ocamlPackages.lablgtk3 38 + ]; 29 39 30 - nativeBuildInputs = [ ocamlPackages.ocaml ocamlPackages.findlib ] 31 - ++ lib.optionals enableX11 [ copyDesktopItems wrapGAppsHook3 ]; 32 - buildInputs = lib.optionals enableX11 [ gsettings-desktop-schemas ocamlPackages.lablgtk3 ]; 33 - 34 - makeFlags = [ "PREFIX=$(out)" ] 35 - ++ lib.optionals (!ocamlPackages.ocaml.nativeCompilers) [ "NATIVE=false" ]; 40 + makeFlags = [ 41 + "PREFIX=$(out)" 42 + ] ++ lib.optionals (!ocamlPackages.ocaml.nativeCompilers) [ "NATIVE=false" ]; 36 43 37 44 postInstall = lib.optionalString enableX11 '' 38 45 install -D $src/icons/U.svg $out/share/icons/hicolor/scalable/apps/unison.svg ··· 47 54 genericName = "File synchronization tool"; 48 55 exec = "unison-gui"; 49 56 icon = "unison"; 50 - categories = [ "Utility" "FileTools" "GTK" ]; 57 + categories = [ 58 + "Utility" 59 + "FileTools" 60 + "GTK" 61 + ]; 51 62 startupNotify = true; 52 63 startupWMClass = "Unison"; 53 64 }); 54 65 55 - meta = with lib; { 66 + meta = { 56 67 homepage = "https://www.cis.upenn.edu/~bcpierce/unison/"; 57 68 description = "Bidirectional file synchronizer"; 58 - license = licenses.gpl3Plus; 59 - maintainers = with maintainers; [ nevivurn ]; 60 - platforms = platforms.unix; 69 + license = lib.licenses.gpl3Plus; 70 + maintainers = with lib.maintainers; [ nevivurn ]; 71 + platforms = lib.platforms.unix; 61 72 broken = stdenv.hostPlatform.isDarwin && enableX11; # unison-gui and uimac are broken on darwin 62 73 mainProgram = if enableX11 then "unison-gui" else "unison"; 63 74 };