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: ac4f36e3eb7d
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 4bd48f61257f
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Jun 1, 2019

  1. synapse-bt: unstable-2018-10-17 -> unstable-2019-05-26

    @dywedir
    dywedir committed Jun 1, 2019
    Copy the full SHA
    6cc9bc3 View commit details

  2. Merge pull request #62409 from dywedir/synapse-bt 

    synapse-bt: unstable-2018-10-17 -> unstable-2019-05-26
    @marsam
    marsam authored Jun 1, 2019
    Copy the full SHA
    4bd48f6 View commit details
Showing with 9 additions and 8 deletions.
  1. +8 −7 pkgs/applications/networking/p2p/synapse-bt/default.nix
  2. +1 −1 pkgs/top-level/all-packages.nix
15 changes: 8 additions & 7 deletions pkgs/applications/networking/p2p/synapse-bt/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,20 +1,21 @@
{ stdenv, fetchFromGitHub, rustPlatform, pkgconfig, openssl, Security }:
{ stdenv, fetchFromGitHub, rustPlatform, pkgconfig, openssl, CoreServices, Security }:

rustPlatform.buildRustPackage rec {
name = "synapse-bt-unstable-${version}";
version = "2018-10-17";
pname = "synapse-bt";
version = "unstable-2019-05-26";

src = fetchFromGitHub {
owner = "Luminarys";
repo = "synapse";
rev = "76d5e9a23ad00c25cfd0469b1adb479b9ded113a";
sha256 = "1lsfvcsmbsg51v8c2hkpwkx0zg25sdjc3q7x72b5bwwnw9l0iglz";
rev = "4a6e6c33b4c36eca89d216906d615797ba9a519e";
sha256 = "0110y3lkzfhgvmdg6q71jyp5q9jjp2bzdb6cwnkp8c734c2k1gfw";
};

cargoSha256 = "0ay6k52x6lzyvmzmlzrjfyqmify9wz74hxsdh8mhrhlpcvll17h1";
cargoSha256 = "0m4jigz6la3mf4yq217849ilcncb7d97mqyw2qicff4rbscdgf6h";

nativeBuildInputs = [ pkgconfig ];
buildInputs = [ openssl ] ++ stdenv.lib.optional stdenv.isDarwin Security;
buildInputs = [ openssl ]
++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices Security ];

cargoBuildFlags = [ "--all" ];

2 changes: 1 addition & 1 deletion pkgs/top-level/all-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -19227,7 +19227,7 @@ in
synapse = callPackage ../applications/misc/synapse { };

synapse-bt = callPackage ../applications/networking/p2p/synapse-bt {
inherit (darwin.apple_sdk.frameworks) Security;
inherit (darwin.apple_sdk.frameworks) CoreServices Security;
};

synfigstudio = callPackage ../applications/graphics/synfigstudio {