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

Commits on May 29, 2019

  1. Copy the full SHA
    56eac1c View commit details
  2. quaternion: 0.0.9.4 -> 0.0.9.4c

    This is technically not needed as the changes only relate to appstream packaging
    but as we are rebuilding it anyway due to libqmatrixclient changing, we might as
    well.
    peterhoeg committed May 29, 2019
    Copy the full SHA
    907e3c8 View commit details

Commits on May 30, 2019

  1. Merge pull request #62204 from peterhoeg/u/quaternion

    quaternion: 0.0.9.4 -> 0.0.9.4c
    peterhoeg authored May 30, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    c10addd View commit details
Showing with 8 additions and 2 deletions.
  1. +2 −1 pkgs/applications/networking/instant-messengers/quaternion/default.nix
  2. +6 −1 pkgs/development/libraries/libqmatrixclient/default.nix
Original file line number Diff line number Diff line change
@@ -37,6 +37,7 @@ let
};

in rec {
quaternion = generic "0.0.9.4" "12mkwiqqbi4774kwl7gha72jyf0jf547acy6rw8ry249zl4lja54" "" libqmatrixclient_0_5;
quaternion = generic "0.0.9.4c" "12mkwiqqbi4774kwl7gha72jyf0jf547acy6rw8ry249zl4lja54" "" libqmatrixclient_0_5;

quaternion-git = quaternion;
}
7 changes: 6 additions & 1 deletion pkgs/development/libraries/libqmatrixclient/default.nix
Original file line number Diff line number Diff line change
@@ -12,6 +12,10 @@ let
inherit sha256;
};

postPatch = ''
sed -i -e '/example/Id' CMakeLists.txt
'';

buildInputs = [ qtbase qtmultimedia ];

nativeBuildInputs = [ cmake ];
@@ -27,6 +31,7 @@ let

in rec {
libqmatrixclient_0_4 = generic "0.4.2.1" "056hvp2m74wx72yd8vai18siddj9l8bhrvrkc4ia4cwjsqw02kid" "v";
libqmatrixclient_0_5 = generic "0.5.1.2" "0vvpm1vlqfvhgfvavifrj4998g8v33hp5xjf0n8zfsmg4lxlnfg1" "";
libqmatrixclient_0_5 = generic "0.5.2" "1bhlqfs7251fss4icx794ka614npr6zyrpp4qwc4q5408ykfm7lr" "";

libqmatrixclient = libqmatrixclient_0_4;
}