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: 7795a7ad5f03
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: 135a7f9604c4
Choose a head ref
  • 3 commits
  • 5 files changed
  • 3 contributors

Commits on Dec 7, 2018

  1. nix-review: 0.6.1 -> 1.0.1 

    - use nix build instead of nix-build
- writes per-build log in the current working directory
- symlinks the builds in the current working directory
- detects & deduplicates build aliases
- markdown reports
- filter builds by regex
- generate nix expression files that can be build by the user

(cherry picked from commit 53f1ffa)
    @Mic92
    Mic92 committed Dec 7, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    jbedo Justin Bedő
    GPG key ID: 2C18202C56C182BD
    Verified
    Learn about vigilant mode
    Copy the full SHA
    59ae1fd View commit details

  2. flashplayer: 31.0.0.153 -> 32.0.0.101 

    (cherry picked from commit f7a266d)
Backport of #51623
    @taku0 @srhb
    taku0 authored and srhb committed Dec 7, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    4b4c24c View commit details

  3. tor: 0.3.4.8 -> 0.3.4.9 

    https://gitweb.torproject.org/tor.git/plain/ChangeLog?h=tor-0.3.4.9

Please confirm the sha256 is correct for a verified tarball,
I'm not setup (or know how offhand but docs look promising)
to do this myself.

(cherry picked from commit c78761b)
    @dtzWill @joachifm
    dtzWill authored and joachifm committed Dec 7, 2018
    Copy the full SHA
    135a7f9 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
@@ -100,11 +100,11 @@ let

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

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

12 changes: 6 additions & 6 deletions pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix
View file
Original file line number Diff line number Diff line change
@@ -74,25 +74,25 @@ let
in
stdenv.mkDerivation rec {
name = "flashplayer-${version}";
version = "31.0.0.153";
version = "32.0.0.101";

src = fetchurl {
url =
if debug then
"https://fpdownload.macromedia.com/pub/flashplayer/updaters/31/flash_player_npapi_linux_debug.${arch}.tar.gz"
"https://fpdownload.macromedia.com/pub/flashplayer/updaters/32/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
"0d3ch1ksxra8hvbqnzj5fmbvlz6hq42b3rncx4vpjlwrcjd9ggy9"
"0383r5pl1jrspy06mpxq50kkip5q5v052kz9aymk4qylgy1dwpn2"
else
"1qldcashv1x64cvpbx1741hz32rmc0dp7i3ayhpbi15rvf95qx8f"
"1vx2map0wlj6bj8dqyxxaymmz9awjjfhi6097knpmqp6j8dj7l5g"
else
if arch == "x86_64" then
"114n3kvdyfmn2w6w6zbijx29fz10x3cbjyy3ci05n0y07lhq1grc"
"003mr9mqkg0agj3zlmci5a1m3lnhj27mnvqswjaffdg5rlihvxyi"
else
"0sxvjf3xylm4bmhianyfy54gzbm4gkq1i9q8gg4fn3nb3c0z7327";
"1smmdsnnlsssakzqas5268svyv3rk717zr7kwpkj4rd5d1pqwcps";
};

nativeBuildInputs = [ unzip ];
10 changes: 5 additions & 5 deletions pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix
View file
Original file line number Diff line number Diff line change
@@ -50,19 +50,19 @@

stdenv.mkDerivation rec {
name = "flashplayer-standalone-${version}";
version = "31.0.0.153";
version = "32.0.0.101";

src = fetchurl {
url =
if debug then
"https://fpdownload.macromedia.com/pub/flashplayer/updaters/31/flash_player_sa_linux_debug.x86_64.tar.gz"
"https://fpdownload.macromedia.com/pub/flashplayer/updaters/32/flash_player_sa_linux_debug.x86_64.tar.gz"
else
"https://fpdownload.macromedia.com/pub/flashplayer/updaters/31/flash_player_sa_linux.x86_64.tar.gz";
"https://fpdownload.macromedia.com/pub/flashplayer/updaters/32/flash_player_sa_linux.x86_64.tar.gz";
sha256 =
if debug then
"1k78nwrz5zbsj5jvn340n2y4dz1zxrcb7f7955d8dra15w0zax1k"
"1i59vfhxrlksxwmr3kj3dfbasfjgnx9aimmv400z07fw3zmdrbpw"
else
"0ajg3p4c36xzvvjl2hpbzn2g3xwjgf2xy6x4478aq7fxfgb0vf6s";
"0fz9zhp0qn9xda5pg37dfnvx04n8d7156h1qayf2l3la94apsacq";
};

nativeBuildInputs = [ unzip ];
4 changes: 2 additions & 2 deletions pkgs/tools/package-management/nix-review/default.nix
View file
Original file line number Diff line number Diff line change
@@ -8,13 +8,13 @@

python3.pkgs.buildPythonApplication rec {
pname = "nix-review";
version = "0.6.1";
version = "1.0.1";

src = fetchFromGitHub {
owner = "Mic92";
repo = "nix-review";
rev = version;
sha256 = "0ggw90zp40mms4hpphcn1vy1764rbvl2ix45h26v0wkn32cbqn49";
sha256 = "18z7dws3ngx0ffqqgybq65xxsiycildd101q58sj51z1k3lnrynh";
};

makeWrapperArgs = [
4 changes: 2 additions & 2 deletions pkgs/tools/security/tor/default.nix
View file
Original file line number Diff line number Diff line change
@@ -14,11 +14,11 @@
}:

stdenv.mkDerivation rec {
name = "tor-0.3.4.8";
name = "tor-0.3.4.9";

src = fetchurl {
url = "https://dist.torproject.org/${name}.tar.gz";
sha256 = "08qhzcmzxp5xr2l5721vagksqnnbrzzzy5hmz5y9r8lrq2r4qsl2";
sha256 = "0jhnvnp08hsfrzgsvg5xnfxyaw3nzgg9h24cwbwnz6iby20i05qs";
};

outputs = [ "out" "geoip" ];