Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

syncthing: 1.27.9 -> 1.27.12 #340610

Merged
merged 2 commits into from
Sep 9, 2024
Merged

syncthing: 1.27.9 -> 1.27.12 #340610

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
83224d2
syncthing: modernize
smancill Sep 8, 2024
a44194c
syncthing: 1.27.9 -> 1.27.12
smancill Sep 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 10 additions & 14 deletions pkgs/applications/networking/syncthing/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,16 @@ let
common = { stname, target, postInstall ? "" }:
buildGoModule rec {
pname = stname;
version = "1.27.9";
version = "1.27.12";

src = fetchFromGitHub {
owner = "syncthing";
repo = "syncthing";
rev = "v${version}";
hash = "sha256-9PKx5jxntG1QjDA+6XySxGahE1IrKKBl/Xk5ZaCAf5I=";
hash = "sha256-/HPq71KkWUE0vG7qUBD3JON4N5KBkuRWc4SvX/JA2nQ=";
};

vendorHash = "sha256-Xv5x+/1lx8nyXw72eEHz7+qnkyZfPAnBtDRrOrD2l+g=";
vendorHash = "sha256-R5GlsCkfoMc5km+NaV+TNUlM3Ot1ARcXfEFimcZOLI4=";

nativeBuildInputs = lib.optionals stdenv.isDarwin [
# Recent versions of macOS seem to require binaries to be signed when
Expand Down Expand Up @@ -61,14 +61,14 @@ let
inherit (nixosTests) syncthing syncthing-init syncthing-relay;
};

meta = with lib; {
meta = {
homepage = "https://syncthing.net/";
description = "Open Source Continuous File Synchronization";
changelog = "https://github.com/syncthing/syncthing/releases/tag/v${version}";
license = licenses.mpl20;
maintainers = with maintainers; [ joko peterhoeg ];
license = lib.licenses.mpl20;
maintainers = with lib.maintainers; [ joko peterhoeg ];
mainProgram = target;
platforms = platforms.unix;
platforms = lib.platforms.unix;
};
};

Expand All @@ -90,17 +90,13 @@ in
'' + lib.optionalString (stdenv.isLinux) ''
mkdir -p $out/lib/systemd/{system,user}

substitute etc/linux-systemd/system/syncthing-resume.service \
$out/lib/systemd/system/syncthing-resume.service \
--replace /usr/bin/pkill ${procps}/bin/pkill

substitute etc/linux-systemd/system/[email protected] \
$out/lib/systemd/system/[email protected] \
--replace /usr/bin/syncthing $out/bin/syncthing
--replace-fail /usr/bin/syncthing $out/bin/syncthing

substitute etc/linux-systemd/user/syncthing.service \
$out/lib/systemd/user/syncthing.service \
--replace /usr/bin/syncthing $out/bin/syncthing
--replace-fail /usr/bin/syncthing $out/bin/syncthing
'';
};

Expand All @@ -118,7 +114,7 @@ in

substitute cmd/strelaysrv/etc/linux-systemd/strelaysrv.service \
$out/lib/systemd/system/strelaysrv.service \
--replace /usr/bin/strelaysrv $out/bin/strelaysrv
--replace-fail /usr/bin/strelaysrv $out/bin/strelaysrv
'';
};
}