ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-09-29 08:38:18 +03:00
Code Issues Projects Releases Wiki Activity

unison: 2.53.2 -> 2.53.4

Browse Source
This commit is contained in:
Yongun Seong 2024-02-20 08:08:50 +09:00
parent d1707e6ede
commit f844dad6ee
No known key found for this signature in database
2 changed files with 16 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
pkgs/applications/networking/sync/unison/default.nix → pkgs/by-name/un/unison/package.nix
View File

@ -2,50 +2,37 @@
, stdenv , stdenv
, fetchFromGitHub , fetchFromGitHub
, ocamlPackages , ocamlPackages
, ncurses
, copyDesktopItems , copyDesktopItems
, makeDesktopItem , makeDesktopItem
, wrapGAppsHook , wrapGAppsHook
, gsettings-desktop-schemas , gsettings-desktop-schemas
, zlib , enableX11 ? !stdenv.isDarwin
, enableX11 ? true
, Cocoa
}: }:
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "unison"; pname = "unison";
version = "2.53.2"; version = "2.53.4";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "bcpierce00"; owner = "bcpierce00";
repo = "unison"; repo = "unison";
rev = "v${finalAttrs.version}"; rev = "v${finalAttrs.version}";
sha256 = "sha256-H+70NZZP0cUsxetFcsjWEx2kENsgMdo/41wBwwaX6zg="; hash = "sha256-nFT6FjlQjh6qx0fepmT4aiQj2SxA7U/as+IU9xXNok0=";
}; };
strictDeps = true; strictDeps = true;
nativeBuildInputs = [ ocamlPackages.ocaml ] # uimac requires xcode
postPatch = ''
sed -i -e 's/ macuimaybe//' src/Makefile
'';
nativeBuildInputs = [ ocamlPackages.ocaml ocamlPackages.findlib ]
++ lib.optionals enableX11 [ copyDesktopItems wrapGAppsHook ]; ++ lib.optionals enableX11 [ copyDesktopItems wrapGAppsHook ];
buildInputs = [ ncurses zlib ] buildInputs = lib.optionals enableX11 [ gsettings-desktop-schemas ocamlPackages.lablgtk3 ];
++ lib.optionals enableX11 [ gsettings-desktop-schemas ]
++ lib.optionals stdenv.isDarwin [ Cocoa ];
preBuild = lib.optionalString enableX11 '' makeFlags = [ "PREFIX=$(out)" ]
sed -i "s|\(OCAMLOPT=.*\)$|\1 -I $(echo "${ocamlPackages.lablgtk3}"/lib/ocaml/*/site-lib/lablgtk3)|" src/Makefile.OCaml ++ lib.optionals (!ocamlPackages.ocaml.nativeCompilers) [ "NATIVE=false" ];
sed -i "s|\(OCAMLOPT=.*\)$|\1 -I $(echo "${ocamlPackages.cairo2}"/lib/ocaml/*/site-lib/cairo2)|" src/Makefile.OCaml
'' + ''
echo -e '\ninstall:\n\tcp $(FSMONITOR)$(EXEC_EXT) $(INSTALLDIR)' >> src/fsmonitor/linux/Makefile
'';
makeFlags = [
"INSTALLDIR=$(out)/bin/"
"UISTYLE=${if enableX11 then "gtk3" else "text"}"
] ++ lib.optional (!ocamlPackages.ocaml.nativeCompilers) "NATIVE=false";
preInstall = ''
mkdir -p $out/bin
'';
postInstall = lib.optionalString enableX11 '' postInstall = lib.optionalString enableX11 ''
install -D $src/icons/U.svg $out/share/icons/hicolor/scalable/apps/unison.svg install -D $src/icons/U.svg $out/share/icons/hicolor/scalable/apps/unison.svg
@ -58,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: {
desktopName = "Unison"; desktopName = "Unison";
comment = "Bidirectional file synchronizer"; comment = "Bidirectional file synchronizer";
genericName = "File synchronization tool"; genericName = "File synchronization tool";
exec = "unison"; exec = "unison-gui";
icon = "unison"; icon = "unison";
categories = [ "Utility" "FileTools" "GTK" ]; categories = [ "Utility" "FileTools" "GTK" ];
startupNotify = true; startupNotify = true;
@ -69,8 +56,9 @@ stdenv.mkDerivation (finalAttrs: {
homepage = "https://www.cis.upenn.edu/~bcpierce/unison/"; homepage = "https://www.cis.upenn.edu/~bcpierce/unison/";
description = "Bidirectional file synchronizer"; description = "Bidirectional file synchronizer";
license = licenses.gpl3Plus; license = licenses.gpl3Plus;
maintainers = with maintainers; [ viric ]; maintainers = with maintainers; [ viric nevivurn ];
platforms = platforms.unix; platforms = platforms.unix;
mainProgram = "unison"; broken = stdenv.isDarwin && enableX11; # unison-gui and uimac are broken on darwin
mainProgram = if enableX11 then "unison-gui" else "unison";
}; };
}) })

5
pkgs/top-level/all-packages.nix
View File

@ -35860,11 +35860,6 @@ with pkgs;
unipicker = callPackage ../applications/misc/unipicker { }; unipicker = callPackage ../applications/misc/unipicker { };
unison = callPackage ../applications/networking/sync/unison {
enableX11 = config.unison.enableX11 or true;
inherit (darwin.apple_sdk.frameworks) Cocoa;
};
unpaper = callPackage ../tools/graphics/unpaper { }; unpaper = callPackage ../tools/graphics/unpaper { };
unison-ucm = callPackage ../development/compilers/unison { }; unison-ucm = callPackage ../development/compilers/unison { };