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

Commits on Apr 1, 2019

  1. xmrig: 2.13.1 -> 2.14.1 

    (cherry picked from commit 6f6cb6a)
    @fpletz
    fpletz committed Apr 1, 2019
    Copy the full SHA
    5352b95 View commit details

  2. xmrig-proxy: 2.11.0 -> 2.14.0 

    (cherry picked from commit 40be34b)
    @fpletz
    fpletz committed Apr 1, 2019
    Copy the full SHA
    0652117 View commit details

  3. matrix-synapse: 0.99.1.1 -> 0.99.2 

    (cherry picked from commit 9620a0c)
    @pacien @fpletz
    pacien authored and fpletz committed Apr 1, 2019
    Copy the full SHA
    cce652c View commit details

  4. riot-web: 1.0.1 -> 1.0.3 (#57586) 

    (cherry picked from commit 2d6c19e)
    @nyanloutre @fpletz
    nyanloutre authored and fpletz committed Apr 1, 2019
    Copy the full SHA
    3fddd9d View commit details

  5. riot-web: 1.0.3 -> 1.0.5 (#58040) 

    (cherry picked from commit 62fd641)
    @nyanloutre @fpletz
    nyanloutre authored and fpletz committed Apr 1, 2019
    Copy the full SHA
    1f22614 View commit details

  6. riot-web: 1.0.5 -> 1.0.6 

    (cherry picked from commit d44138b)
    @fpletz
    fpletz committed Apr 1, 2019
    Copy the full SHA
    d4c1d6b View commit details
4 changes: 2 additions & 2 deletions pkgs/applications/misc/xmrig/default.nix
View file
Original file line number Diff line number Diff line change
@@ -4,13 +4,13 @@

stdenv.mkDerivation rec {
name = "xmrig-${version}";
version = "2.13.1";
version = "2.14.1";

src = fetchFromGitHub {
owner = "xmrig";
repo = "xmrig";
rev = "v${version}";
sha256 = "1s6hz9r0079r9sd1wgd1nm6wn1dmix4smz7174g9a29z2zcqr160";
sha256 = "0pc3ssmnn36xs3jgznx36q4z3qh06fkbz8md3p3rk6rpvly929pn";
};

nativeBuildInputs = [ cmake ];
4 changes: 2 additions & 2 deletions pkgs/applications/misc/xmrig/proxy.nix
View file
Original file line number Diff line number Diff line change
@@ -4,13 +4,13 @@

stdenv.mkDerivation rec {
name = "xmrig-proxy-${version}";
version = "2.11.0";
version = "2.14.0";

src = fetchFromGitHub {
owner = "xmrig";
repo = "xmrig-proxy";
rev = "v${version}";
sha256 = "1jjcgnpkxdafsdsxndsvzd84i6mwk7ix4vvgs3k1dla9ll9nwq5j";
sha256 = "0yw9g18blrwncy1ya9iwbfx8l7bs0v6nmnkk71bxz4zj9d8dkal3";
};

nativeBuildInputs = [ cmake ];
4 changes: 2 additions & 2 deletions pkgs/applications/networking/instant-messengers/riot/riot-web.nix
View file
Original file line number Diff line number Diff line change
@@ -3,11 +3,11 @@
let configFile = writeText "riot-config.json" conf; in
stdenv.mkDerivation rec {
name= "riot-web-${version}";
version = "1.0.1";
version = "1.0.6";

src = fetchurl {
url = "https://github.com/vector-im/riot-web/releases/download/v${version}/riot-v${version}.tar.gz";
sha256 = "0p2aj8zj1ynn75g0rjyx7dkhvcmvh3d38wpx0hf4fvg9q13vby85";
sha256 = "09sm1k3iypqn93iazfx10y4bqz06d2h8f0902sgrj5qbnaq4jcxr";
};

installPhase = ''
4 changes: 2 additions & 2 deletions pkgs/servers/matrix-synapse/default.nix
View file
Original file line number Diff line number Diff line change
@@ -23,11 +23,11 @@ let

in buildPythonApplication rec {
pname = "matrix-synapse";
version = "0.99.1.1";
version = "0.99.2";

src = fetchPypi {
inherit pname version;
sha256 = "1ych13x3c2cam7af4q2ariwvzwvr65g3j2x8ajjn33ydwxxbqbg6";
sha256 = "0y6vic0fjx9k8178vsns0ab4ngqx8qhiyampqnil0b1biqcd68bw";
};

patches = [