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: bcc922cea191
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: 8d3ff5bf4e3c
Choose a head ref
  • 3 commits
  • 4 files changed
  • 2 contributors

Commits on Mar 9, 2020

  1. gitlab: 12.8.2 -> 12.8.5 (#82142) 

    https://about.gitlab.com/releases/2020/03/09/gitlab-12-8-5-released/
(cherry-picked from commit f391999)
    Milan committed Mar 9, 2020
    Copy the full SHA
    58b019c View commit details

  2. firefox: Fix AArch64 build 

    This is the equivalent change to d4446c5

That particular change could not be backported as-is due to refactors in
the firefox derivation.
    @samueldr
    samueldr committed Mar 9, 2020
    Copy the full SHA
    23d18e2 View commit details

  3. Merge pull request #82171 from samueldr/19.09/aarch64/firefox 

    [19.09] firefox: Fix AArch64 build
    @samueldr
    samueldr authored Mar 9, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    NeQuissimus Tim Steinbach
    GPG key ID: FD36A5EAAC49035A
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    8d3ff5b View commit details
5 changes: 5 additions & 0 deletions pkgs/applications/networking/browsers/firefox/common.nix
View file
Original file line number Diff line number Diff line change
@@ -120,6 +120,11 @@ let
sha256 = "1zg56v3lc346fkzcjjx21vjip2s9hb2xw4pvza1dsfdnhsnzppfp";
})
]
++ lib.optional (lib.versionAtLeast ffversion "73") (fetchpatch {
# https://phabricator.services.mozilla.com/D60667
url = "https://hg.mozilla.org/mozilla-central/raw-rev/b3d8b08265b800165d684281d19ac845a8ff9a66";
sha256 = "0b4s75w7sl619rglcjmlyvyibpj2ar5cpy6pnywl1xpd9qzyb27p";
})
++ patches;

nss_pkg = if lib.versionAtLeast ffversion "71" then nss_3_49_2 else nss;
8 changes: 4 additions & 4 deletions pkgs/applications/version-management/gitlab/data.json
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"version": "12.8.2",
"repo_hash": "1d27s61kglryr5pashwfq55z7fh16fxkx1m4gc82xihwfzarf4x9",
"version": "12.8.5",
"repo_hash": "1y5606p793w1js39420jcd2bj42cripczgrdxgg2cq0r2kq8axk8",
"owner": "gitlab-org",
"repo": "gitlab",
"rev": "v12.8.2-ee",
"rev": "v12.8.5-ee",
"passthru": {
"GITALY_SERVER_VERSION": "12.8.2",
"GITALY_SERVER_VERSION": "12.8.5",
"GITLAB_PAGES_VERSION": "1.16.0",
"GITLAB_SHELL_VERSION": "11.0.0",
"GITLAB_WORKHORSE_VERSION": "8.21.0"
4 changes: 2 additions & 2 deletions pkgs/applications/version-management/gitlab/gitaly/default.nix
View file
Original file line number Diff line number Diff line change
@@ -19,14 +19,14 @@ let
};
};
in buildGoPackage rec {
version = "12.8.2";
version = "12.8.5";
pname = "gitaly";

src = fetchFromGitLab {
owner = "gitlab-org";
repo = "gitaly";
rev = "v${version}";
sha256 = "1zc44y5yl799vqg12w3iaivk4xwj9i4k6f198svplipa760nl9ic";
sha256 = "19pwffncihhywfac7ybry38vyj3pmdz66g5nqrvwn4xxw7ypvd24";
};

# Fix a check which assumes that hook files are writeable by their
4 changes: 2 additions & 2 deletions pkgs/applications/version-management/gitlab/gitaly/deps.nix
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.