Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: d84fb6400cc6
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 4e222ab09d16
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Jan 8, 2020

  1. syncthing: 1.3.2 -> 1.3.3 

    Changelog: https://github.com/syncthing/syncthing/releases/tag/v1.3.3
    @marsam
    marsam committed Jan 8, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    Ekleog Léo Gaspard
    GPG key ID: 8A55848B6090F9CF
    Verified
    Learn about vigilant mode
    Copy the full SHA
    4477b1e View commit details

Commits on Jan 9, 2020

  1. Merge pull request #77351 from marsam/update-syncthing 

    syncthing: 1.3.2 -> 1.3.3
    @peterhoeg
    peterhoeg authored Jan 9, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    Ekleog Léo Gaspard
    GPG key ID: 8A55848B6090F9CF
    Verified
    Learn about vigilant mode
    Copy the full SHA
    4e222ab View commit details
Showing with 3 additions and 3 deletions.
  1. +3 −3 pkgs/applications/networking/syncthing/default.nix
6 changes: 3 additions & 3 deletions pkgs/applications/networking/syncthing/default.nix
View file
Original file line number Diff line number Diff line change
@@ -3,19 +3,19 @@
let
common = { stname, target, postInstall ? "" }:
buildGoModule rec {
version = "1.3.2";
version = "1.3.3";
name = "${stname}-${version}";

src = fetchFromGitHub {
owner = "syncthing";
repo = "syncthing";
rev = "v${version}";
sha256 = "029mym3vdfg616gpmhv6p22iy65h8vff2sq6z70l37bjf3zx1cms";
sha256 = "0bcp8kbj8xsnly2dfafnfvj6vl27mbgvj84pjk0wxdjfnr2my9ic";
};

goPackagePath = "github.com/syncthing/syncthing";

modSha256 = "06anhfi9mswmwhhjyz8mla6h8v83cc7slfr752fvgfaxra1fwgx8";
modSha256 = "0kv24bi3w3pvjyjng7ly67brq8wkc1xnhsyha1h7v3jbmj5fgb12";

patches = [
./add-stcli-target.patch