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: 0d9055a2ac29
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: eab4ee0c27c5
Choose a head ref
  • 3 commits
  • 1 file changed
  • 2 contributors

Commits on Dec 29, 2019

  1. riot-web: 1.5.0 -> 1.5.5 

    (cherry picked from commit 7395dea)
    @pacien @fpletz
    pacien authored and fpletz committed Dec 29, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    0x4A6F
    GPG key ID: 8DEDBA5BE07080E1
    Verified
    Learn about vigilant mode
    Copy the full SHA
    2c9f673 View commit details

  2. riot-web: Run install hooks 

    (cherry picked from commit 9e710b2)
    @dasJ @fpletz
    dasJ authored and fpletz committed Dec 29, 2019
    Copy the full SHA
    8104ea3 View commit details

  3. riot-web: 1.5.5 -> 1.5.6 

    (cherry picked from commit 0a05392)
    @pacien @fpletz
    pacien authored and fpletz committed Dec 29, 2019
    Copy the full SHA
    eab4ee0 View commit details
Showing with 6 additions and 2 deletions.
  1. +6 −2 pkgs/applications/networking/instant-messengers/riot/riot-web.nix
8 changes: 6 additions & 2 deletions pkgs/applications/networking/instant-messengers/riot/riot-web.nix
View file
Original file line number Diff line number Diff line change
@@ -5,21 +5,25 @@

stdenv.mkDerivation rec {
pname = "riot-web";
version = "1.5.0";
version = "1.5.6";

src = fetchurl {
url = "https://github.com/vector-im/riot-web/releases/download/v${version}/riot-v${version}.tar.gz";
sha256 = "08r9473ncfy3wzqhnds729s77fq82jjgz8w3yya07aahcxzasi94";
sha256 = "063ynbil038y201skyldj2ysr0hwgwq981w1iw104xd17x31zmn0";
};

installPhase = let
configFile = if (conf != null)
then writeText "riot-config.json" conf
else "$out/config.sample.json";
in ''
runHook preInstall
mkdir -p $out/
cp -R . $out/
ln -s ${configFile} $out/config.json
runHook postInstall
'';

meta = {