Skip to content
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
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 33e2402afb22
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 14e1a15ced3f
Choose a head ref
  • 2 commits
  • 3 files changed
  • 2 contributors

Commits on Jul 13, 2017

  1. tinycc: 0.9.27pre-20170605 -> 0.9.27pre-20170710 

    Various CPP improvements/fixes
Support forward declaration of enums (GNU extension)
Initial implementation of C11 _Generic

(cherry picked from commit cfc6e44)
    @joachifm
    joachifm committed Jul 13, 2017
    Copy the full SHA
    e9200fc View commit details

  2. flashplayer: 26.0.0.131 -> 26.0.0.137 

    (cherry picked from commit eca15bd)
    @taku0 @joachifm
    taku0 authored and joachifm committed Jul 13, 2017
    Copy the full SHA
    14e1a15 View commit details
4 changes: 2 additions & 2 deletions pkgs/applications/networking/browsers/chromium/plugins.nix
View file
Original file line number Diff line number Diff line change
@@ -94,12 +94,12 @@ let

flash = stdenv.mkDerivation rec {
name = "flashplayer-ppapi-${version}";
version = "26.0.0.131";
version = "26.0.0.137";

src = fetchzip {
url = "https://fpdownload.adobe.com/pub/flashplayer/pdc/"
+ "${version}/flash_player_ppapi_linux.x86_64.tar.gz";
sha256 = "1cw5pmzfyaaxxd3kf90nz8zn5r06qmkh8l793j3db4n0ffxg5c1s";
sha256 = "0zmslmy7i7ywb2frckg5afkmfqb2lm2mahq0qs8msjzcx9jk4pyx";
stripRoot = false;
};

10 changes: 5 additions & 5 deletions pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix
View file
Original file line number Diff line number Diff line change
@@ -73,7 +73,7 @@ let
in
stdenv.mkDerivation rec {
name = "flashplayer-${version}";
version = "26.0.0.131";
version = "26.0.0.137";

src = fetchurl {
url =
@@ -84,14 +84,14 @@ stdenv.mkDerivation rec {
sha256 =
if debug then
if arch == "x86_64" then
"0yqrw2gl9i0z33kcv5dpp3x3jyq9ksqfaqjgkk7xcy127ahric8s"
"1kdwprrrxbdgll05x148vhg86ph77ygr99ycfblblj8wjkcz9s0z"
else
"0cmjqm5asqqcqavpkldm6wgjb49m9n018rixi7cj9zcwhfakm7zr"
"1ldv0fca43kdda949095r3gk1bc9p8n94z61qijkmrpv91zv5qvl"
else
if arch == "x86_64" then
"0agz4k5319m5bd0nqzkzvy8r28nr6c5j9b0jr6a8yh9s844aga8w"
"0db6dcqal7p79q26kglnsbiv3ysx9r3c7rkdiynww18gzr40vwls"
else
"0jzvhyi1qgfjp9l85ffgcxqa87ymi899q2j68b9hfsn9hlw1sc5f";
"1fm6p91c63pyr0lra29vcq2dplb2c7a5114nm4r9rrrzjxakqw5w";
};

nativeBuildInputs = [ unzip ];
6 changes: 3 additions & 3 deletions pkgs/development/compilers/tinycc/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,10 +2,10 @@
with stdenv.lib;

let
date = "20170605";
date = "20170710";
version = "0.9.27pre-${date}";
rev = "3e4b7693bfd5b76570b35558c83a935326513eff";
sha256 = "0m5k1df73kakvg9xz06y3nlac4mwfccni6hdijaf4w8fyy3zz4bg";
rev = "2acb04f7f2077a4cff103421d79ceee48441918a";
sha256 = "1rh89dx1myqfm752d4rlzrm8aadfm17fm88ps0q9ibmbxavb45qw";
in

stdenv.mkDerivation rec {