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: 18f8c1fe060b
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: 2257e6cf4d7f
Choose a head ref
  • 4 commits
  • 4 files changed
  • 3 contributors

Commits on Nov 5, 2020

  1. ant: 1.9.6 -> 1.9.15 

    (cherry picked from commit 9072b63)
    @dasj19 @redvers
    dasj19 authored and redvers committed Nov 5, 2020
    Copy the full SHA
    d70b1e2 View commit details

Commits on Nov 9, 2020

  1. Merge pull request #102844 from redvers/update_apacheAnt_1_9_2003_1.9.15 

    apacheAnt_1_9: 1.9.6 -> 1.9.15 [20.03]
    @andir
    andir authored Nov 9, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    ad42cb8 View commit details

  2. element-web: 1.7.12 -> 1.7.13 

    https://github.com/vector-im/element-web/releases/tag/v1.7.13
(cherry picked from commit feb893a)
    @Ma27
    Ma27 committed Nov 9, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    Ma27 Maximilian Bosch
    GPG key ID: 091DBF4D1FC46B8E
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    9dc018c View commit details

  3. element-desktop: 1.7.12 -> 1.7.13 

    https://github.com/vector-im/element-desktop/releases/tag/v1.7.13
(cherry picked from commit ad63add)
    @Ma27
    Ma27 committed Nov 9, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    Ma27 Maximilian Bosch
    GPG key ID: 091DBF4D1FC46B8E
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    2257e6c View commit details
2 changes: 1 addition & 1 deletion pkgs/applications/networking/instant-messengers/element/element-desktop-package.json
View file
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@
"name": "element-desktop",
"productName": "Element",
"main": "src/electron-main.js",
"version": "1.7.12",
"version": "1.7.13",
"description": "A feature-rich client for Matrix.org",
"author": "Element",
"repository": {
4 changes: 2 additions & 2 deletions pkgs/applications/networking/instant-messengers/element/element-desktop.nix
View file
Original file line number Diff line number Diff line change
@@ -8,12 +8,12 @@

let
executableName = "element-desktop";
version = "1.7.12";
version = "1.7.13";
src = fetchFromGitHub {
owner = "vector-im";
repo = "riot-desktop";
rev = "v${version}";
sha256 = "08d9llrglap5bbicdkbdl9l71wba2kkyhdyd0a4iqdz3l2jvv698";
sha256 = "04nm5amhc0bqqwcc1c9x88lnbjaaryfs0xhi4as65l5ac4jdkzjc";
};
electron = electron_8;

4 changes: 2 additions & 2 deletions pkgs/applications/networking/instant-messengers/element/element-web.nix
View file
Original file line number Diff line number Diff line change
@@ -36,11 +36,11 @@ let

in stdenv.mkDerivation rec {
pname = "element-web";
version = "1.7.12";
version = "1.7.13";

src = fetchurl {
url = "https://github.com/vector-im/riot-web/releases/download/v${version}/riot-v${version}.tar.gz";
sha256 = "173hdg09cw13vqh0lvz6kl0mq4i3rsacjxhspkpydh2qd1g3hjrs";
sha256 = "13ylzyr1kkrppvp86kih60pqxlsvqlcsgz2gj4azgmrf2bijfby3";
};

installPhase = ''
4 changes: 2 additions & 2 deletions pkgs/development/tools/build-managers/apache-ant/1.9.nix
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{ fetchurl, stdenv, coreutils, makeWrapper }:

let version = "1.9.6"; in
let version = "1.9.15"; in

stdenv.mkDerivation {
pname = "ant";
@@ -10,7 +10,7 @@ stdenv.mkDerivation {

src = fetchurl {
url = "mirror://apache/ant/binaries/apache-ant-${version}-bin.tar.bz2";
sha256 = "1cwd5vq175gyicw0hkm8idwa33zxwhf7xlxywaqxcqqdjql0jfx4";
sha256 = "0yfx5qsvrg12lar4908ndbnlpppy7g7qk8ay41y4sz9g873v07mr";
};

contrib = fetchurl {