diff options
| author | Pascal Wittmann <mail@pascal-wittmann.de> | 2018-08-09 13:10:27 +0200 |
|---|---|---|
| committer | Pascal Wittmann <mail@pascal-wittmann.de> | 2018-08-09 13:10:27 +0200 |
| commit | af8cd3c74e80ff532b17568039ecc4f143992813 (patch) | |
| tree | 58f3d9e423eec59b42a6a7533a094fabeeb17c12 /pkgs/applications/networking/instant-messengers | |
| parent | 8915ed06b30f6d48d99d0d9d2bc713b40a8db063 (diff) | |
| parent | 1d4de0d552ae9aa66a5b8dee5fb0650a4372d148 (diff) | |
| download | nixlib-af8cd3c74e80ff532b17568039ecc4f143992813.tar nixlib-af8cd3c74e80ff532b17568039ecc4f143992813.tar.gz nixlib-af8cd3c74e80ff532b17568039ecc4f143992813.tar.bz2 nixlib-af8cd3c74e80ff532b17568039ecc4f143992813.tar.lz nixlib-af8cd3c74e80ff532b17568039ecc4f143992813.tar.xz nixlib-af8cd3c74e80ff532b17568039ecc4f143992813.tar.zst nixlib-af8cd3c74e80ff532b17568039ecc4f143992813.zip | |
Merge branch 'master' into add-missing-licenses
Conflicts: pkgs/applications/version-management/subversion/default.nix
Diffstat (limited to 'pkgs/applications/networking/instant-messengers')
| -rw-r--r-- | pkgs/applications/networking/instant-messengers/pybitmessage/default.nix | 14 | ||||
| -rw-r--r-- | pkgs/applications/networking/instant-messengers/signal-desktop/default.nix | 4 |
2 files changed, 9 insertions, 9 deletions
diff --git a/pkgs/applications/networking/instant-messengers/pybitmessage/default.nix b/pkgs/applications/networking/instant-messengers/pybitmessage/default.nix index 654c343caa8b..3f6b23d70a05 100644 --- a/pkgs/applications/networking/instant-messengers/pybitmessage/default.nix +++ b/pkgs/applications/networking/instant-messengers/pybitmessage/default.nix @@ -1,18 +1,18 @@ -{ stdenv, fetchFromGitHub, pythonPackages, openssl }: +{ stdenv, fetchFromGitHub, python2Packages, openssl }: -pythonPackages.buildPythonApplication rec { - name = "pybitmessage-${version}"; +python2Packages.buildPythonApplication rec { + pname = "pybitmessage"; - version = "0.6.2"; + version = "0.6.3.2"; src = fetchFromGitHub { owner = "bitmessage"; repo = "PyBitmessage"; - rev = "v${version}"; - sha256 = "04sgns9qczzw2152gqdr6bjyy4fmgs26cz8n3qck94l0j51rxhz8"; + rev = version; + sha256 = "1lmhbpwsqh1v93krlqqhafw2pc3y0qp8zby186yllbph6s8kdp35"; }; - propagatedBuildInputs = with pythonPackages; [ msgpack-python pyqt4 numpy pyopencl ] ++ [ openssl ]; + propagatedBuildInputs = with python2Packages; [ msgpack-python pyqt4 numpy pyopencl ] ++ [ openssl ]; preConfigure = '' # Remove interaction and misleading output diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index 459bdf98b1e4..c8b4c951abaf 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -55,11 +55,11 @@ let in stdenv.mkDerivation rec { name = "signal-desktop-${version}"; - version = "1.15.0"; + version = "1.15.3"; src = fetchurl { url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - sha256 = "1q73jx92h8zwk1dn103ymskz35q6kfiqc44886jr0p7mlpndqsa4"; + sha256 = "009bcy90dvwiizya387fqrh3a8l0czgs4wnddxndy9gd477sn704"; }; phases = [ "unpackPhase" "installPhase" ]; |