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: 05a32d8e771d
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: f277096c4c4f
Choose a head ref
11 contributors

Commits on May 31, 2020

  1. glibc: patch CVE-2020-1752 

    /cc roundup #88306; the issue seems quite serious to me.

I also made two other patches non-conditional, as we rebuild
all platforms anyway.

(cherry picked from commit 3f08d64)
    @vcunat
    vcunat committed May 31, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    vcunat Vladimír Čunát
    GPG key ID: E747DF1F9575A3AA
    Verified
    Learn about vigilant mode
    Copy the full SHA
    5fc6f8c View commit details

Commits on Jun 3, 2020

  1. gitlab: 12.8.10 -> 12.10.6 

    (cherry picked from commit f613702)
    @flokli
    Milan Pässler authored and flokli committed Jun 3, 2020
    Copy the full SHA
    3a0a5e5 View commit details

  2. gitlab: increase webpack memory limit 

    (cherry picked from commit 7555548)
    @flokli
    Milan Pässler authored and flokli committed Jun 3, 2020
    Copy the full SHA
    2968e6f View commit details

  3. nixos/gitlab: use new structure.sql 

    According to https://gitlab.com/gitlab-org/gitlab/-/issues/211487

(cherry picked from commit 47c8e52)
    @flokli
    Milan Pässler authored and flokli committed Jun 3, 2020
    Copy the full SHA
    3069def View commit details

  4. gitaly: revert a commit that broke config loading 

    (cherry picked from commit e32bf64)
    @flokli
    Milan Pässler authored and flokli committed Jun 3, 2020
    Copy the full SHA
    d181fdf View commit details

  5. gitaly: fix gitlab-shell-config path patching 

    (cherry picked from commit 7060927)
    @globin @flokli
    globin authored and flokli committed Jun 3, 2020
    Copy the full SHA
    6bd20ee View commit details

  6. gitlab: 12.10.6 -> 12.10.8 

    (cherry picked from commit af05325)
    @globin @flokli
    globin authored and flokli committed Jun 3, 2020
    Copy the full SHA
    0610639 View commit details

  7. gitlab: 12.10.8 -> 12.10.9 

    (cherry picked from commit d7b09d36955f5319f58b20df304a06947324ecfb)
    @flokli
    flokli committed Jun 3, 2020
    Copy the full SHA
    2947a53 View commit details

Commits on Jun 4, 2020

  1. kdeFrameworks.qqc2-desktop-style: init at 5.68 

    (cherry picked from commit 9cc24aa)
    @peterhoeg
    peterhoeg committed Jun 4, 2020
    Copy the full SHA
    1ce9a00 View commit details

  2. Merge pull request #89458 from peterhoeg/bp/qqc2-desktop-style 

    kdeFrameworks.qqc2-desktop-style: init at 5.68 (backport to stable)
    @peterhoeg
    peterhoeg authored Jun 4, 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
    7ec663f View commit details

  3. riot-web: 1.6.2 -> 1.6.3 

    https://github.com/vector-im/riot-web/releases/tag/v1.6.3
(cherry picked from commit c51202f)
    @Ma27
    Ma27 committed Jun 4, 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
    bad756a View commit details

  4. riot-desktop: 1.6.2 -> 1.6.3 

    https://github.com/vector-im/riot-desktop/releases/tag/v1.6.3
(cherry picked from commit 91099c1)
    @Ma27
    Ma27 committed Jun 4, 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
    ea2d173 View commit details

  5. Merge staging-20.03 into release-20.03

    @FRidh
    FRidh committed Jun 4, 2020
    Copy the full SHA
    6939378 View commit details

  6. Merge pull request #89435 from flokli/20.03/gitlab-12.10.9 

    [20.03] gitlab: 12.8.10 -> 12.10.9
    @flokli
    flokli authored Jun 4, 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
    58f884c View commit details

Commits on Jun 5, 2020

  1. atlassian-jira: 8.8.0 -> 8.9.0 

    (cherry picked from commit 9b5df08)
    @megheaiulian @WilliButz
    megheaiulian authored and WilliButz committed Jun 5, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    WilliButz
    GPG key ID: 92582A10F1179CB2
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    6797081 View commit details

  2. atlassian-confluence: 7.5.0 -> 7.5.1 

    (cherry picked from commit 0f2d9bb)
    @WilliButz @lheckemann
    WilliButz authored and lheckemann committed Jun 5, 2020
    Copy the full SHA
    1f54141 View commit details

  3. linux: 4.14.182 -> 4.14.183

    @NeQuissimus
    NeQuissimus committed Jun 5, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    NeQuissimus Tim Steinbach
    GPG key ID: 6538CB9266B06F31
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    6524079 View commit details

  4. linux: 4.19.125 -> 4.19.126

    @NeQuissimus
    NeQuissimus committed Jun 5, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    NeQuissimus Tim Steinbach
    GPG key ID: 6538CB9266B06F31
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    1f96786 View commit details

  5. linux: 4.4.225 -> 4.4.226

    @NeQuissimus
    NeQuissimus committed Jun 5, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    NeQuissimus Tim Steinbach
    GPG key ID: 6538CB9266B06F31
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    9ecbc8d View commit details

  6. linux: 4.9.225 -> 4.9.226

    @NeQuissimus
    NeQuissimus committed Jun 5, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    NeQuissimus Tim Steinbach
    GPG key ID: 6538CB9266B06F31
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    e8f0687 View commit details

  7. linux: 5.4.43 -> 5.4.44

    @NeQuissimus
    NeQuissimus committed Jun 5, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    NeQuissimus Tim Steinbach
    GPG key ID: 6538CB9266B06F31
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    114bc19 View commit details

  8. linux: 5.6.15 -> 5.6.16

    @NeQuissimus
    NeQuissimus committed Jun 5, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    NeQuissimus Tim Steinbach
    GPG key ID: 6538CB9266B06F31
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    fdfd5ab View commit details

  9. youtube-dl: 2020.05.29 -> 2020.06.06 

    https://github.com/ytdl-org/youtube-dl/releases/tag/2020.06.06
(cherry picked from commit dfe8770)
    @Luflosi @Ma27
    Luflosi authored and Ma27 committed Jun 5, 2020

    Partially verified

    This commit is signed with the committer’s verified signature. The key has expired.
    Ma27’s contribution has been verified via GPG key.
    We cannot verify signatures from co-authors, and some of the co-authors attributed to this commit require their commits to be signed.
    Copy the full SHA
    e1ff9d3 View commit details

  10. Merge #89474: thunderbird*: 68.8.1 -> 68.9.0 (security) 

    (cherry picked from commit 5a8cdcc)
Re-tested both briefly on 20.03.
    @vcunat
    vcunat committed Jun 5, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    vcunat Vladimír Čunát
    GPG key ID: E747DF1F9575A3AA
    Verified
    Learn about vigilant mode
    Copy the full SHA
    29c0151 View commit details

  11. mautrix-whatsapp: 2020-06-01 -> 0.1.1 

    https://github.com/tulir/mautrix-whatsapp/releases/tag/v0.1.1
https://github.com/tulir/mautrix-whatsapp/releases/tag/v0.1.0
(cherry picked from commit 0402df6)
    @Ma27
    Ma27 committed Jun 5, 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
    a0466d5 View commit details

  12. riot-web: 1.6.3 -> 1.6.4 

    https://github.com/vector-im/riot-web/releases/tag/v1.6.4
(cherry picked from commit 3351a81)
    @Ma27
    Ma27 committed Jun 5, 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
    33d51b7 View commit details

  13. riot-desktop: 1.6.3 -> 1.6.4 

    https://github.com/vector-im/riot-desktop/releases/tag/v1.6.4
(cherry picked from commit 877d65b)
    @Ma27
    Ma27 committed Jun 5, 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
    f277096 View commit details
Showing with 1,795 additions and 1,258 deletions.
  1. +1 −1 nixos/modules/services/misc/gitlab.nix
  2. +3 −2 pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json
  3. +8 −8 pkgs/applications/networking/instant-messengers/riot/riot-desktop-yarndeps.nix
  4. +2 −2 pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix
  5. +2 −2 pkgs/applications/networking/instant-messengers/riot/riot-web.nix
  6. +245 −245 pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix
  7. +2 −2 pkgs/applications/networking/mailreaders/thunderbird/default.nix
  8. +7 −7 pkgs/applications/version-management/gitlab/data.json
  9. +1 −1 pkgs/applications/version-management/gitlab/default.nix
  10. +3 −3 pkgs/applications/version-management/gitlab/gitaly/Gemfile
  11. +12 −20 pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock
  12. +7 −5 pkgs/applications/version-management/gitlab/gitaly/default.nix
  13. +232 −43 pkgs/applications/version-management/gitlab/gitaly/deps.nix
  14. +13 −39 pkgs/applications/version-management/gitlab/gitaly/gemset.nix
  15. +2 −2 pkgs/applications/version-management/gitlab/gitlab-shell/default.nix
  16. +2 −2 pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix
  17. +232 −34 pkgs/applications/version-management/gitlab/gitlab-workhorse/deps.nix
  18. +20 −17 pkgs/applications/version-management/gitlab/rubyEnv/Gemfile
  19. +69 −64 pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock
  20. +113 −82 pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix
  21. +3 −3 pkgs/applications/version-management/gitlab/update.py
  22. +708 −644 pkgs/applications/version-management/gitlab/yarnPkgs.nix
  23. +62 −0 pkgs/development/libraries/glibc/2.30-cve-2020-1752.patch
  24. +2 −2 pkgs/development/libraries/glibc/common.nix
  25. +3 −2 pkgs/development/libraries/kde-frameworks/default.nix
  26. +15 −0 pkgs/development/libraries/kde-frameworks/qqc2-desktop-style.nix
  27. +2 −2 pkgs/os-specific/linux/kernel/linux-4.14.nix
  28. +2 −2 pkgs/os-specific/linux/kernel/linux-4.19.nix
  29. +2 −2 pkgs/os-specific/linux/kernel/linux-4.4.nix
  30. +2 −2 pkgs/os-specific/linux/kernel/linux-4.9.nix
  31. +2 −2 pkgs/os-specific/linux/kernel/linux-5.4.nix
  32. +2 −2 pkgs/os-specific/linux/kernel/linux-5.6.nix
  33. +2 −2 pkgs/servers/atlassian/confluence.nix
  34. +2 −2 pkgs/servers/atlassian/jira.nix
  35. +7 −7 pkgs/servers/mautrix-whatsapp/default.nix
  36. +2 −2 pkgs/tools/misc/youtube-dl/default.nix
  37. +1 −1 pkgs/top-level/all-packages.nix
2 changes: 1 addition & 1 deletion nixos/modules/services/misc/gitlab.nix
View file
Original file line number Diff line number Diff line change
@@ -129,7 +129,7 @@ let
HOME = "${cfg.statePath}/home";
UNICORN_PATH = "${cfg.statePath}/";
GITLAB_PATH = "${cfg.packages.gitlab}/share/gitlab/";
SCHEMA = "${cfg.statePath}/db/schema.rb";
SCHEMA = "${cfg.statePath}/db/structure.sql";
GITLAB_UPLOADS_PATH = "${cfg.statePath}/uploads";
GITLAB_LOG_PATH = "${cfg.statePath}/log";
GITLAB_REDIS_CONFIG_FILE = pkgs.writeText "redis.yml" (builtins.toJSON redisConfig);
5 changes: 3 additions & 2 deletions pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json
View file
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@
"name": "riot-desktop",
"productName": "Riot",
"main": "src/electron-main.js",
"version": "1.6.2",
"version": "1.6.4",
"description": "A feature-rich client for Matrix.org",
"author": "New Vector Ltd.",
"repository": {
@@ -14,6 +14,7 @@
"scripts": {
"mkdirs": "mkdirp packages deploys",
"fetch": "yarn run mkdirs && node scripts/fetch-package.js",
"asar-webapp": "asar p webapp webapp.asar",
"start": "electron .",
"lint": "eslint src/ scripts/ hak/",
"build:native": "yarn run hak",
@@ -47,7 +48,7 @@
"find-npm-prefix": "^1.0.2",
"fs-extra": "^8.1.0",
"glob": "^7.1.6",
"matrix-js-sdk": "6.1.0",
"matrix-js-sdk": "6.2.1",
"mkdirp": "^1.0.3",
"needle": "^2.3.2",
"node-pre-gyp": "^0.14.0",
16 changes: 8 additions & 8 deletions pkgs/applications/networking/instant-messengers/riot/riot-desktop-yarndeps.nix
View file
Original file line number Diff line number Diff line change
@@ -146,11 +146,11 @@
};
}
{
name = "acorn___acorn_6.4.0.tgz";
name = "acorn___acorn_6.4.1.tgz";
path = fetchurl {
name = "acorn___acorn_6.4.0.tgz";
url = "https://registry.yarnpkg.com/acorn/-/acorn-6.4.0.tgz";
sha1 = "b659d2ffbafa24baf5db1cdbb2c94a983ecd2784";
name = "acorn___acorn_6.4.1.tgz";
url = "https://registry.yarnpkg.com/acorn/-/acorn-6.4.1.tgz";
sha1 = "531e58ba3f51b9dacb9a6646ca4debf5b14ca474";
};
}
{
@@ -3154,11 +3154,11 @@
};
}
{
name = "matrix_js_sdk___matrix_js_sdk_6.1.0.tgz";
name = "matrix_js_sdk___matrix_js_sdk_6.2.1.tgz";
path = fetchurl {
name = "matrix_js_sdk___matrix_js_sdk_6.1.0.tgz";
url = "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-6.1.0.tgz";
sha1 = "c28ad67c113c4aa9c8bce409c7ba550170bdc2ee";
name = "matrix_js_sdk___matrix_js_sdk_6.2.1.tgz";
url = "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-6.2.1.tgz";
sha1 = "d5f76491a650c0a36fcdd078cff59f2da96edd7b";
};
}
{
4 changes: 2 additions & 2 deletions pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix
View file
Original file line number Diff line number Diff line change
@@ -8,12 +8,12 @@

let
executableName = "riot-desktop";
version = "1.6.2";
version = "1.6.4";
src = fetchFromGitHub {
owner = "vector-im";
repo = "riot-desktop";
rev = "v${version}";
sha256 = "1anmch9z3na7rphxb0p9cnk55388z22iwfnfjhmjps1ii5wx4rls";
sha256 = "05z7mggsp33m7ljl4ibk9r4dccglbsc2arp4i3dknq364zdga3m2";
};
electron = electron_7;

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
@@ -12,11 +12,11 @@ let

in stdenv.mkDerivation rec {
pname = "riot-web";
version = "1.6.2";
version = "1.6.4";

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

installPhase = ''
Loading