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: 5f2252cc6afc
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: ad2585e35015
Choose a head ref
  • 4 commits
  • 2 files changed
  • 3 contributors

Commits on Feb 23, 2019

  1. handbrake: 1.2.1 -> 1.2.2

    @Anton-Latukha
    Anton-Latukha committed Feb 23, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    bagder Daniel Stenberg
    GPG key ID: 5CC908FDB71E12C2
    Verified
    Learn about vigilant mode
    Copy the full SHA
    a541cf8 View commit details

  2. handbrake: rm callPackage dep

    @Anton-Latukha
    Anton-Latukha committed Feb 23, 2019

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Learn about vigilant mode
    Copy the full SHA
    997be75 View commit details

Commits on Feb 24, 2019

  1. Merge pull request #56256 from Anton-Latukha/handbrake-1.2.2 

    handbrake: 1.2.1 -> 1.2.2, rm callPackage dep
    @ryantm
    ryantm authored Feb 24, 2019

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Learn about vigilant mode
    Copy the full SHA
    9001a4e View commit details

  2. harfbuzz-icu: disable error for cast-align

    @matthewbauer
    matthewbauer committed Feb 24, 2019

    Partially verified

    This commit is signed with the committer’s verified signature.
    vcunat’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
    ad2585e View commit details
Showing with 7 additions and 3 deletions.
  1. +3 −3 pkgs/applications/video/handbrake/default.nix
  2. +4 −0 pkgs/development/libraries/harfbuzz/default.nix
6 changes: 3 additions & 3 deletions pkgs/applications/video/handbrake/default.nix
View file
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
# Derivation patches HandBrake to use Nix closure dependencies.
#

{ stdenv, lib, fetchurl, callPackage,
{ stdenv, lib, fetchurl,
# Main build tools
python2, pkgconfig, autoconf, automake, cmake, nasm, libtool, m4,
# Processing, video codecs, containers
@@ -30,11 +30,11 @@

stdenv.mkDerivation rec {
pname = "handbrake";
version = "1.2.1";
version = "1.2.2";

src = fetchurl {
url = ''https://download2.handbrake.fr/${version}/HandBrake-${version}-source.tar.bz2'';
sha256 = "0gbqzar49c8ygz6chnsz65xgsdcwr60lbc8ivnw8i6xjggn6wc80";
sha256 = "0k2yaqy7zi06k8mkp9az2mn9dlgj3a1339vacakfh2nn2zsics6z";
};

nativeBuildInputs = [
4 changes: 4 additions & 0 deletions pkgs/development/libraries/harfbuzz/default.nix
View file
Original file line number Diff line number Diff line change
@@ -23,6 +23,10 @@ stdenv.mkDerivation {
postPatch = ''
patchShebangs src/gen-def.py
patchShebangs test
'' + stdenv.lib.optionalString stdenv.isDarwin ''
# ApplicationServices.framework headers have cast-align warnings.
substituteInPlace src/hb.hh \
--replace '#pragma GCC diagnostic error "-Wcast-align"' ""
'';

outputs = [ "out" "dev" ];