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: 41add65fb902
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: 1517b764c29a
Choose a head ref
  • 7 commits
  • 4 files changed
  • 4 contributors

Commits on Jun 24, 2020

  1. mp4v2: 2.0.0 -> 4.1.3 

    Switch into maintanable fork. It is the community central fork.

Remove old patch, use new minor upstream patch to compile.

I weighted-in on the patch reasoning to be merged.

Strictify hardening.

Documentation update

M  pkgs/development/libraries/mp4v2/default.nix

(cherry picked from commit c281c84)
    @Anton-Latukha @danieldk
    Anton-Latukha authored and danieldk committed Jun 24, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    CRBroughton Craig R Broughton
    GPG key ID: A9923C0202EEA387
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    78e2687 View commit details

Commits on Jun 25, 2020

  1. Merge pull request #91402 from danieldk/mp4v2 

    [20.03] mp4v2: 2.0.0 -> 4.1.3
    Christian Kauhaus authored Jun 25, 2020
    Copy the full SHA
    3dbed61 View commit details

  2. php: 7.2.29 -> 7.2.31, 7.3.16 -> 7.3.19, 7.4.6 -> 7.4.7 

    Security and bugfix updates for PHP.

Fixes #88380, #88379, #90939, #90921, #90924, #88382

See #91495 for PR against master.
    Christian Kauhaus committed Jun 25, 2020
    Copy the full SHA
    6da23f1 View commit details

  3. linux: 5.4.48 -> 5.4.49 

    (cherry picked from commit 5d807cc)
    @NeQuissimus
    NeQuissimus committed Jun 25, 2020
    Copy the full SHA
    b879e5a View commit details

  4. linux: 5.7.4 -> 5.7.5 

    (cherry picked from commit c4a784b)
    @NeQuissimus
    NeQuissimus committed Jun 25, 2020
    Copy the full SHA
    c1f9fb3 View commit details

  5. linux: 5.7.5 -> 5.7.6 

    (cherry picked from commit 06f0a0f)
    @NeQuissimus
    NeQuissimus committed Jun 25, 2020
    Copy the full SHA
    46c4fbd View commit details

  6. Merge pull request #91496 from ckauhaus/secfix-php-20.03 

    [20.03] php: 7.2.29 -> 7.2.31, 7.3.16 -> 7.3.19, 7.4.6 -> 7.4.7
    @Ma27
    Ma27 authored Jun 25, 2020
    Copy the full SHA
    1517b76 View commit details
12 changes: 6 additions & 6 deletions pkgs/development/interpreters/php/default.nix
View file
Original file line number Diff line number Diff line change
@@ -263,23 +263,23 @@ let

in {
php72 = generic {
version = "7.2.29";
sha256 = "08xry2fgqgg8s0ym1hh11wkbr36av3zq1bn4krbciw1b7x8gb8ga";
version = "7.2.31";
sha256 = "0057x1s43f9jidmrl8daka6wpxclxc1b1pm5cjbz616p8nbmb9qv";

# https://bugs.php.net/bug.php?id=76826
extraPatches = optional stdenv.isDarwin ./php72-darwin-isfinite.patch;
};

php73 = generic {
version = "7.3.16";
sha256 = "0bh499v9dfgh9k51w4rird1slb9rh9whp5h37fb84c98d992s1xq";
version = "7.3.19";
sha256 = "199l1lr7ima92icic7b1bqlb036md78m305lc3v6zd4zw8qix70d";

# https://bugs.php.net/bug.php?id=76826
extraPatches = optional stdenv.isDarwin ./php73-darwin-isfinite.patch;
};

php74 = generic {
version = "7.4.6";
sha256 = "0j133pfwa823d4jhx2hkrrzjl4hswvz00b1z58r5c82xd5sr9vd6";
version = "7.4.7";
sha256 = "0ynq4fz54jpzh9nxvbgn3vrdad2clbac0989ai0yrj2ryc0hs3l0";
};
}
30 changes: 15 additions & 15 deletions pkgs/development/libraries/mp4v2/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,39 +1,39 @@
{ stdenv, lib, fetchurl }:
{ stdenv, lib, fetchFromGitHub, fetchurl }:

stdenv.mkDerivation rec {
name = "mp4v2-2.0.0";

src = fetchurl {
url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/mp4v2/${name}.tar.bz2";
sha256 = "0f438bimimsvxjbdp4vsr8hjw2nwggmhaxgcw07g2z361fkbj683";
pname = "mp4v2";
version = "4.1.3";

src = fetchFromGitHub {
# 2020-06-20: THE current upstream, maintained and used in distros fork.
owner = "TechSmith";
repo = "mp4v2";
rev = "Release-ThirdParty-MP4v2-${version}";
sha256 = "053a0lgy819sbz92cfkq0vmkn2ky39bva554pj4ypky1j6vs04fv";
};

patches = [
(fetchurl {
name = "gcc-7.patch";
url = "https://src.fedoraproject.org/cgit/rpms/libmp4v2.git/plain/"
+ "0004-Fix-GCC7-build.patch?id=d7aeedabb";
# 2020-06-19: NOTE: # Fix build with C++11
# Close when https://github.com/TechSmith/mp4v2/pull/36 merged/closed.
url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/libmp4v2-c++11.patch?id=203f5a72bc97ffe089b424c47b07dd9eaea35713";
sha256 = "0sbn0il7lmk77yrjyb4f0a3z3h8gsmdkscvz5n9hmrrrhrwf672w";
})
];

buildFlags = [ "CXXFLAGS=-std=c++03" ];

# `faac' expects `mp4.h'.
postInstall = "ln -s mp4v2/mp4v2.h $out/include/mp4.h";

hardeningDisable = [ "format" ];

enableParallelBuilding = true;

meta = {
description = "Abandoned library. Provides functions to read, create, and modify mp4 files";
description = "Provides functions to read, create, and modify mp4 files";
longDescription = ''
MP4v2 library provides an API to work with mp4 files
as defined by ISO-IEC:14496-1:2001 MPEG-4 Systems.
This container format is derived from Apple's QuickTime format.
'';
homepage = https://code.google.com/archive/p/mp4v2/;
homepage = "https://github.com/TechSmith/mp4v2";
maintainers = [ lib.maintainers.Anton-Latukha ];
platforms = lib.platforms.unix;
license = lib.licenses.mpl11;
4 changes: 2 additions & 2 deletions pkgs/os-specific/linux/kernel/linux-5.4.nix
View file
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
with stdenv.lib;

buildLinux (args // rec {
version = "5.4.48";
version = "5.4.49";

# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {

src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
sha256 = "0lqxryxn0bfly337ddhl7m7qdwblxg8i1fsl8v9i9h84rnpxs85z";
sha256 = "0g2psjf2q10mfc3vv6brjn6s2nkg73ll1s04gpshw907d9irpn2m";
};
} // (args.argsOverride or {}))
4 changes: 2 additions & 2 deletions pkgs/os-specific/linux/kernel/linux-5.7.nix
View file
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
with stdenv.lib;

buildLinux (args // rec {
version = "5.7.4";
version = "5.7.6";

# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {

src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
sha256 = "06mm0bmjw54aypfhhbm9aaz5bmgymvygfak587iwv901635gb95w";
sha256 = "1rhhys2fvfrfsc6lk0qkq59p83qhwvns4jhk0jlyylyzqqywkm4z";
};
} // (args.argsOverride or {}))