Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
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-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 1a92d0abfcdb
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: e69cfc351bef
Choose a head ref
  • 6 commits
  • 1 file changed
  • 1 contributor

Commits on Jul 14, 2020

  1. syncthing: 1.3.4 -> 1.4.0 

    Changelog: https://github.com/syncthing/syncthing/releases/tag/v1.4.0
(cherry picked from commit d27b2f8)
    @marsam @rnhmjoj
    marsam authored and rnhmjoj committed Jul 14, 2020
    Copy the full SHA
    65eebab View commit details

  2. syncthing: 1.4.0 -> 1.4.1 

    Changelog: https://github.com/syncthing/syncthing/releases/tag/v1.4.1
(cherry picked from commit beeb70c)
    @marsam @rnhmjoj
    marsam authored and rnhmjoj committed Jul 14, 2020
    Copy the full SHA
    14966af View commit details

  3. syncthing: 1.4.1 -> 1.4.2 

    Changelog: https://github.com/syncthing/syncthing/releases/tag/v1.4.2
(cherry picked from commit b3fbd22)
    @marsam @rnhmjoj
    marsam authored and rnhmjoj committed Jul 14, 2020
    Copy the full SHA
    32498a7 View commit details

  4. syncthing: 1.4.2 -> 1.5.0 

    Changelog: https://github.com/syncthing/syncthing/releases/tag/v1.5.0
(cherry picked from commit 07f093f)
    @marsam @rnhmjoj
    marsam authored and rnhmjoj committed Jul 14, 2020
    Copy the full SHA
    ff02971 View commit details

  5. syncthing: 1.5.0 -> 1.6.1 

    (cherry picked from commit 056089e)
    @marsam @rnhmjoj
    marsam authored and rnhmjoj committed Jul 14, 2020
    Copy the full SHA
    dee67ad View commit details

  6. Merge pull request #93123 from rnhmjoj/syncthing-20.03 

    [20.03] syncthing: 1.3.4 -> 1.6.1
    @marsam
    marsam authored Jul 14, 2020
    Copy the full SHA
    e69cfc3 View commit details
Showing with 3 additions and 5 deletions.
  1. +3 −5 pkgs/applications/networking/syncthing/default.nix
8 changes: 3 additions & 5 deletions pkgs/applications/networking/syncthing/default.nix
View file
Original file line number Diff line number Diff line change
@@ -3,19 +3,17 @@
let
common = { stname, target, postInstall ? "" }:
buildGoModule rec {
version = "1.3.4";
version = "1.6.1";
name = "${stname}-${version}";

src = fetchFromGitHub {
owner = "syncthing";
repo = "syncthing";
rev = "v${version}";
sha256 = "076k06p2vqqz2r5bgvqkjipnhznbfbalp3pa2gjm2j9hy7nldr9f";
sha256 = "1lhbx1mh2hdjjwks3s17i8y9vbl3fnapc1czaf42pp7nf8245q3j";
};

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

modSha256 = "10fgfjip5xr8lim2z0dh7399xpcnhxis9s9yd36fk934h1k1hwzd";
vendorSha256 = "12g63a6jsshzqjgww792xmvybhfbkjx5aza4xnyljjsp453iky7k";

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