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: a9ccf26c3bbd
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 1939476ec13b
Choose a head ref
  • 4 commits
  • 6 files changed
  • 3 contributors

Commits on Sep 13, 2017

  1. libffcall: 1.10 -> 2.0

    Thanks to Bruno Haible for a notifying me of this.
    
    (cherry picked from commit e2ddc7f)
    joachifm committed Sep 13, 2017

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    Copy the full SHA
    11f8e12 View commit details
  2. piwik: 3.0.4 -> 3.1.0

    Patch for Nix was merged upstream and therefore could be removed.
    
    (cherry picked from commit 556dfed)
    florianjacob authored and joachifm committed Sep 13, 2017
    Copy the full SHA
    c4674a8 View commit details
  3. flashplayer: 26.0.0.151 -> 27.0.0.130

    (cherry picked from commit c2e7d1f)
    taku0 authored and joachifm committed Sep 13, 2017
    Copy the full SHA
    23b2ca6 View commit details
  4. socklog: properly disable the chkshsgr test

    My previous attempt d438cbb was
    bogus ...
    
    (cherry picked from commit 705f47f)
    joachifm committed Sep 13, 2017
    Copy the full SHA
    1939476 View commit details
4 changes: 2 additions & 2 deletions pkgs/applications/networking/browsers/chromium/plugins.nix
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.151";
version = "27.0.0.130";

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

Original file line number Diff line number Diff line change
@@ -73,25 +73,25 @@ let
in
stdenv.mkDerivation rec {
name = "flashplayer-${version}";
version = "26.0.0.151";
version = "27.0.0.130";

src = fetchurl {
url =
if debug then
"https://fpdownload.macromedia.com/pub/flashplayer/updaters/26/flash_player_npapi_linux_debug.${arch}.tar.gz"
"https://fpdownload.macromedia.com/pub/flashplayer/updaters/27/flash_player_npapi_linux_debug.${arch}.tar.gz"
else
"https://fpdownload.adobe.com/get/flashplayer/pdc/${version}/flash_player_npapi_linux.${arch}.tar.gz";
sha256 =
if debug then
if arch == "x86_64" then
"0dlgardgrd8a18b48b0l6xk68dqi39yndv05phrypsxzr00p23q8"
"1sj06x4kfwxi9cnc8adjkxk6p81acl39l2idnyqb429l2s84d1d9"
else
"0dbvsww4v6hlqn4yhdmzs335inim5iq0ym998x8zpavilqq51y0d"
"0f9vzdn523m408sw76r32zqf7d86l2mhcfsszbfh2bixg8p2cxzz"
else
if arch == "x86_64" then
"1yywffslh5px15w62wck1rnlp317jr6a334r409q7hxqc3x90z8l"
"0qkdabcnqfpbfsbs8ssms9xk2pqvps6fbasvcyvhnywclra25ggc"
else
"1f1czbx14nvgr1qlzcp03nhj6c55wra8l6f4bsig691n3hfpb6hp";
"0qkwkc6s4ganja4b2jsz4yff0bziirvbzxg0wyf648hqlb3bw5a6";
};

nativeBuildInputs = [ unzip ];
Original file line number Diff line number Diff line change
@@ -55,19 +55,19 @@ let
in
stdenv.mkDerivation rec {
name = "flashplayer-standalone-${version}";
version = "26.0.0.151";
version = "27.0.0.130";

src = fetchurl {
url =
if debug then
"https://fpdownload.macromedia.com/pub/flashplayer/updaters/26/flash_player_sa_linux_debug.x86_64.tar.gz"
"https://fpdownload.macromedia.com/pub/flashplayer/updaters/27/flash_player_sa_linux_debug.x86_64.tar.gz"
else
"https://fpdownload.macromedia.com/pub/flashplayer/updaters/26/flash_player_sa_linux.x86_64.tar.gz";
"https://fpdownload.macromedia.com/pub/flashplayer/updaters/27/flash_player_sa_linux.x86_64.tar.gz";
sha256 =
if debug then
"0pfb217bg0v9hq0cbyndhmhkba16nhz2rasl7kk4ppxcfcjhr5pb"
"0gqm90j8czjnzar3ia65msd18kydjhgq5l9iv1difgm8lqji5ii0"
else
"0a9ayylkpjprad1al7ddplxrpymd181a9gmw9hhk78s11v2zvwn8";
"1agplangzlrp326dhz3xcvi6i325a644ggrh8g0cmgq9nfcpssnb";
};

nativeBuildInputs = [ unzip ];
32 changes: 15 additions & 17 deletions pkgs/development/libraries/libffcall/default.nix
Original file line number Diff line number Diff line change
@@ -2,29 +2,27 @@

stdenv.mkDerivation rec {
name = "libffcall-${version}";
version = "1.10";
version = "2.0";

src = fetchurl {
urls = [
# Europe
"http://www.haible.de/bruno/gnu/ffcall-${version}.tar.gz"
# USA
"ftp://ftp.santafe.edu/pub/gnu/ffcall-${version}.tar.gz"
];
sha256 = "0gcqljx4f8wrq59y13zzigwzaxdrz3jf9cbzcd8h0b2br27mn6vg";
url = "mirror://gnu/libffcall/libffcall-${version}.tar.gz";
sha256 = "0v0rh3vawb8z5q40fs3kr2f9zp06n2fq4rr2ww4562nr96sd5aj1";
};

NIX_CFLAGS_COMPILE = "-Wa,--noexecstack";
enableParallelBuilding = false;

configureFlags = [
"--enable-shared"
"--disable-static"
];
outputs = [ "dev" "out" "doc" "man" ];

meta = {
postInstall = ''
mkdir -p $doc/share/doc/libffcall
mv $out/share/html $doc/share/doc/libffcall
rm -rf $out/share
'';

meta = with stdenv.lib; {
description = "Foreign function call library";
homepage = https://www.haible.de/bruno/packages-ffcall.html;
license = stdenv.lib.licenses.gpl2;
platforms = stdenv.lib.platforms.unix;
homepage = https://www.gnu.org/software/libffcall/;
license = licenses.gpl2Plus;
platforms = platforms.unix;
};
}
13 changes: 2 additions & 11 deletions pkgs/servers/web-apps/piwik/default.nix
Original file line number Diff line number Diff line change
@@ -2,29 +2,20 @@

stdenv.mkDerivation rec {
name = "piwik-${version}";
version = "3.0.4";
version = "3.1.0";

src = fetchurl {
url = "https://builds.piwik.org/${name}.tar.gz";
sha512 = "2i0vydr073ynv7wcn078zxhvywdv85c648hympkzicdd746g995878py9006m96iwkmk4q664wn3f8jnfqsl1jd9f26alz1nssizbn9";
sha512 = "175300ibf0lg4xnyn5v47czi3vd6i7yqf1im3br4975f6k7w8q22m2mk2mi006795js5q52x48g4sc7wb47wac7wbla8wp98al48gfb";
};

nativeBuildInputs = [ makeWrapper ];

# regarding the PIWIK_USER_PATH substitutes:
# looks like this is just a bug / confusion of the directories, and nobody has tested this.
# PR at https://github.com/piwik/piwik/pull/11661
# regarding the 127.0.0.1 substitute:
# This replaces the default value of the database server field.
# unix socket authentication only works with localhost,
# but password-based SQL authentication works with both.
postPatch = ''
substituteInPlace core/AssetManager/UIAssetFetcher.php \
--replace "return PIWIK_USER_PATH;" "return PIWIK_DOCUMENT_ROOT;"
substituteInPlace core/AssetManager/UIAssetMerger/StylesheetUIAssetMerger.php \
--replace "setImportDir(PIWIK_USER_PATH);" "setImportDir(PIWIK_DOCUMENT_ROOT);"
substituteInPlace core/AssetManager/UIAssetMerger/StylesheetUIAssetMerger.php \
--replace "\$absolutePath = PIWIK_USER_PATH" "\$absolutePath = PIWIK_DOCUMENT_ROOT"
substituteInPlace plugins/Installation/FormDatabaseSetup.php \
--replace "=> '127.0.0.1'," "=> 'localhost',"
cp ${./bootstrap.php} bootstrap.php
6 changes: 1 addition & 5 deletions pkgs/tools/system/socklog/default.nix
Original file line number Diff line number Diff line change
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
outputs = [ "out" "man" "doc" ];

postPatch = ''
sed -i src/TARGETS -e '/^chkshsgr/d'
echo "int main() { return 0; }" >src/chkshsgr.c
'';

configurePhase = ''
@@ -27,8 +27,6 @@ stdenv.mkDerivation rec {
buildPhase = ''package/compile'';

installPhase = ''
runHook preInstall
mkdir -p $out/bin
mv command"/"* $out/bin
@@ -39,8 +37,6 @@ stdenv.mkDerivation rec {
mkdir -p $doc/share/doc/socklog/html
mv doc/*.html $doc/share/doc/socklog/html/
runHook postInstall
'';

checkPhase = ''package/check'';