dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

syncthing: 1.27.9 -> 1.27.12 (#340610)

Browse Source
This commit is contained in:
Pol Dellaiera 2024-09-09 10:35:08 +02:00 committed by GitHub
commit 865688327c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
pkgs/applications/networking/syncthing/default.nix
View File

@ -13,16 +13,16 @@ let
common = { stname, target, postInstall ? "" }: common = { stname, target, postInstall ? "" }:
buildGoModule rec { buildGoModule rec {
pname = stname; pname = stname;
version = "1.27.9"; version = "1.27.12";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "syncthing"; owner = "syncthing";
repo = "syncthing"; repo = "syncthing";
rev = "v${version}"; 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 [ nativeBuildInputs = lib.optionals stdenv.isDarwin [
# Recent versions of macOS seem to require binaries to be signed when # Recent versions of macOS seem to require binaries to be signed when
@ -61,14 +61,14 @@ let
inherit (nixosTests) syncthing syncthing-init syncthing-relay; inherit (nixosTests) syncthing syncthing-init syncthing-relay;
}; };
meta = with lib; { meta = {
homepage = "https://syncthing.net/"; homepage = "https://syncthing.net/";
description = "Open Source Continuous File Synchronization"; description = "Open Source Continuous File Synchronization";
changelog = "https://github.com/syncthing/syncthing/releases/tag/v${version}"; changelog = "https://github.com/syncthing/syncthing/releases/tag/v${version}";
license = licenses.mpl20; license = lib.licenses.mpl20;
maintainers = with maintainers; [ joko peterhoeg ]; maintainers = with lib.maintainers; [ joko peterhoeg ];
mainProgram = target; mainProgram = target;
platforms = platforms.unix; platforms = lib.platforms.unix;
}; };
}; };
@ -90,17 +90,13 @@ in
'' + lib.optionalString (stdenv.isLinux) '' '' + lib.optionalString (stdenv.isLinux) ''
mkdir -p $out/lib/systemd/{system,user} 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/syncthing@.service \ substitute etc/linux-systemd/system/syncthing@.service \
$out/lib/systemd/system/syncthing@.service \ $out/lib/systemd/system/syncthing@.service \
--replace /usr/bin/syncthing $out/bin/syncthing --replace-fail /usr/bin/syncthing $out/bin/syncthing
substitute etc/linux-systemd/user/syncthing.service \ substitute etc/linux-systemd/user/syncthing.service \
$out/lib/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
''; '';
}; };
@ -118,7 +114,7 @@ in
substitute cmd/strelaysrv/etc/linux-systemd/strelaysrv.service \ substitute cmd/strelaysrv/etc/linux-systemd/strelaysrv.service \
$out/lib/systemd/system/strelaysrv.service \ $out/lib/systemd/system/strelaysrv.service \
--replace /usr/bin/strelaysrv $out/bin/strelaysrv --replace-fail /usr/bin/strelaysrv $out/bin/strelaysrv
''; '';
}; };
} }