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

Commits on Jan 13, 2020

  1. spectral: unstable-2019-08-30 -> 817 

    * libsecret, now req'd
* url updates
    @dtzWill
    dtzWill committed Jan 13, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    erictapen Kerstin
    GPG key ID: 5F24E3BD56617EB2
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    1e3ac89 View commit details

  2. olm: build w/cmake, simplify expression (somewhat optimistically)

    @dtzWill
    dtzWill committed Jan 13, 2020
    Copy the full SHA
    7d52215 View commit details

Commits on Jan 21, 2020

  1. Merge pull request #76767 from dtzWill/update/spectral-2019-12-23 

    spectral: unstable 2019-08-30 -> 817, olm: cmake+clean
    @dtzWill
    dtzWill authored Jan 21, 2020
    Copy the full SHA
    3bf9cc3 View commit details
Showing with 11 additions and 21 deletions.
  1. +8 −10 pkgs/applications/networking/instant-messengers/spectral/default.nix
  2. +3 −11 pkgs/development/libraries/olm/default.nix
18 changes: 8 additions & 10 deletions pkgs/applications/networking/instant-messengers/spectral/default.nix
View file
Original file line number Diff line number Diff line change
@@ -7,34 +7,32 @@
, qtgraphicaleffects
, qtdeclarative
, qtmacextras
, olm, cmark
, olm, libsecret, cmark
}:

let qtkeychain-qt5 = qtkeychain.override {
inherit qtbase qttools;
withQt5 = true;
};
in stdenv.mkDerivation {
in stdenv.mkDerivation rec {
pname = "spectral";
version = "unstable-2019-08-30";
version = "817";

src = fetchgit {
url = "https://gitlab.com/b0/spectral.git";
rev = "ee86c948aec5fe72979fc6df97f4a6ef711bdf94";
sha256 = "1mqabdkvzq48wki92wm2r79kj8g8m7ganpl47sh60qfsk4bxa8b2";
url = "https://gitlab.com/spectral-im/spectral.git";
rev = version;
sha256 = "0lg0bkz621cmqb67kz1zmn4xwbspcqalz68byll5iszqz9y4gnp1";
fetchSubmodules = true;
};

#qmakeFlags = [ "CONFIG+=qtquickcompiler" "BUNDLE_FONT=true" ];

nativeBuildInputs = [ pkgconfig cmake wrapQtAppsHook ];
buildInputs = [ qtbase qtkeychain-qt5 qtquickcontrols2 qtmultimedia qtgraphicaleffects qtdeclarative olm cmark ]
buildInputs = [ qtbase qtkeychain-qt5 qtquickcontrols2 qtmultimedia qtgraphicaleffects qtdeclarative olm libsecret cmark ]
++ stdenv.lib.optional stdenv.hostPlatform.isLinux libpulseaudio
++ stdenv.lib.optional stdenv.hostPlatform.isDarwin qtmacextras;

meta = with stdenv.lib; {
description = "A glossy cross-platform Matrix client.";
homepage = "https://gitlab.com/b0/spectral";
homepage = "https://spectral.im";
license = licenses.gpl3;
platforms = with platforms; linux ++ darwin;
maintainers = with maintainers; [ dtzWill ];
14 changes: 3 additions & 11 deletions pkgs/development/libraries/olm/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, fetchurl }:
{ stdenv, fetchurl, cmake }:

stdenv.mkDerivation rec {
pname = "olm";
@@ -9,17 +9,9 @@ stdenv.mkDerivation rec {
sha256 = "0f7azjxc77n4ib9nj3cwyk3vhk8r2dsyf7id6nvqyxqxwxn95a8w";
};

doCheck = true;
checkTarget = "test";

# requires optimisation but memory operations are compiled with -O0
hardeningDisable = ["fortify"];
nativeBuildInputs = [ cmake ];

makeFlags = stdenv.lib.optional stdenv.cc.isClang "CC=cc";

installFlags = [
"PREFIX=${placeholder ''out''}"
];
doCheck = true;

meta = {
description = "Implements double cryptographic ratchet and Megolm ratchet";