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: 1517b764c29a
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: 0ba9fdc1e8e1
Choose a head ref
  • 3 commits
  • 2 files changed
  • 2 contributors

Commits on Jun 26, 2020

  1. wordpress: 5.3.3 -> 5.3.4 

    Fixes: CVE-2020-4049
Closes: #91304
    @mweinelt
    mweinelt authored and Jon committed Jun 26, 2020
    Copy the full SHA
    3c24d54 View commit details

  2. wordpress: add passthru.tests 

    (cherry picked from commit f422d65)
    @mweinelt
    mweinelt authored and Jon committed Jun 26, 2020
    Copy the full SHA
    4c8a1df View commit details

  3. rtl8821ce: 5.2.5_1.26055.20180108 -> 5.5.2_34066.20200325 

    The rtl8821ce repository was updated to address for ABI changes to
Linux but our package was too far behind, resulting in breakages
as reported in #88068

Fixes: #88068
(cherry picked from commit 6cbbe4d)
    @msfjarvis @marsam
    msfjarvis authored and marsam committed Jun 26, 2020
    Copy the full SHA
    0ba9fdc View commit details
Showing with 10 additions and 6 deletions.
  1. +3 −3 pkgs/os-specific/linux/rtl8821ce/default.nix
  2. +7 −3 pkgs/servers/web-apps/wordpress/default.nix
6 changes: 3 additions & 3 deletions pkgs/os-specific/linux/rtl8821ce/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{ stdenv, fetchFromGitHub, kernel, bc }:
stdenv.mkDerivation rec {
name = "rtl8821ce-${kernel.version}-${version}";
version = "5.2.5_1.26055.20180108";
version = "5.5.2_34066.20200325";

src = fetchFromGitHub {
owner = "tomaspinho";
repo = "rtl8821ce";
rev = "ab6154e150bbc7d12b0525d4cc1298ae196e45de";
sha256 = "1my0hidqnv4s7hi5897m81pq0sjw05np0g27hlkg9fwb83b5kzsg";
rev = "69765eb288a8dfad3b055b906760b53e02ab1dea";
sha256 = "17jiw25k74kv5lnvgycvj2g1n06hbrpjz6p4znk4a62g136rhn4s";
};

hardeningDisable = [ "pic" ];
10 changes: 7 additions & 3 deletions pkgs/servers/web-apps/wordpress/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,19 +1,23 @@
{ stdenv, fetchurl }:
{ stdenv, fetchurl, nixosTests }:

stdenv.mkDerivation rec {
pname = "wordpress";
version = "5.3.3";
version = "5.3.4";

src = fetchurl {
url = "https://wordpress.org/${pname}-${version}.tar.gz";
sha256 = "13x3qny45g5gx2rqhvkfmh8n43hq3hz5bm5n3n9l46ifmcvhwpnq";
sha256 = "1zff0c8igcx045ikvy65zk34q5y8g5fq5ydsz3cxy7h5sqsyp3ja";
};

installPhase = ''
mkdir -p $out/share/wordpress
cp -r . $out/share/wordpress
'';

passthru.tests = {
inherit (nixosTests) wordpress;
};

meta = with stdenv.lib; {
homepage = "https://wordpress.org";
description = "WordPress is open source software you can use to create a beautiful website, blog, or app";