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: cc95cbed4a2c
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: 22f212537f47
Choose a head ref
  • 2 commits
  • 16 files changed
  • 2 contributors

Commits on Apr 11, 2018

  1. Merge pull request #38765 from taku0/flashplayer-29.0.0.140

    flashplayer: 29.0.0.113 -> 29.0.0.140 [Critical security fixes]
    (cherry picked from commit 896cc08)
    7c6f434c committed Apr 11, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    rickie Rick Ossendrijver
    Copy the full SHA
    2569e48 View commit details
  2. Copy the full SHA
    22f2125 View commit details
4 changes: 2 additions & 2 deletions pkgs/applications/misc/dmenu/default.nix
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
name = "dmenu-4.7";

src = fetchurl {
url = "http://dl.suckless.org/tools/${name}.tar.gz";
url = "https://dl.suckless.org/tools/${name}.tar.gz";
sha256 = "1fgph549i0yw62x02jhfc8qmqk2rnzcnm46bxq6jig1cvkw3amm7";
};

@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {

meta = with stdenv.lib; {
description = "A generic, highly customizable, and efficient menu for the X Window System";
homepage = http://tools.suckless.org/dmenu;
homepage = https://tools.suckless.org/dmenu;
license = licenses.mit;
maintainers = with maintainers; [ viric pSub ];
platforms = platforms.all;
2 changes: 1 addition & 1 deletion pkgs/applications/misc/st/default.nix
Original file line number Diff line number Diff line change
@@ -8,7 +8,7 @@ in stdenv.mkDerivation rec {
name = "st-0.7";

src = fetchurl {
url = "http://dl.suckless.org/st/${name}.tar.gz";
url = "https://dl.suckless.org/st/${name}.tar.gz";
sha256 = "f7870d906ccc988926eef2cc98950a99cc78725b685e934c422c03c1234e6000";
};

2 changes: 1 addition & 1 deletion pkgs/applications/misc/wmname/default.nix
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
name = "wmname-0.1";

src = fetchurl {
url = "http://dl.suckless.org/tools/${name}.tar.gz";
url = "https://dl.suckless.org/tools/${name}.tar.gz";
sha256 = "559ad188b2913167dcbb37ecfbb7ed474a7ec4bbcb0129d8d5d08cb9208d02c5";
};

4 changes: 2 additions & 2 deletions pkgs/applications/networking/browsers/chromium/plugins.nix
Original file line number Diff line number Diff line change
@@ -98,12 +98,12 @@ let

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

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

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

src = fetchurl {
url =
@@ -84,14 +84,14 @@ stdenv.mkDerivation rec {
sha256 =
if debug then
if arch == "x86_64" then
"15nkmnkh4w458n9yp0f54d48vzl8bk6zq3clws8jvd76aa0accl0"
"0bj0d899dswfbkbrm08c381yzm0hlqdv53sgbl2z9zj4x8rqyi3p"
else
"0v9iwnb00jl6s6a1b9cnmqflh50dhyhmlwckk8qv6vy77b2jdsk7"
"16as2dydgqip6qlg13jh83sd4lb2cgrny4ibqg7jlx1d1a1i0jwh"
else
if arch == "x86_64" then
"18cbalnyikb8g8fb861b9kbgsqwrin5k7gd5smz2czk73kmfrph4"
"10s6j5izsy2v2ljljcv2vk898jg9xmp6zqqazmj07zy7m5vywfi7"
else
"06djh4scz97r8h4bsd392paimpybd59q1chd86bdsybm1xkgicmy";
"0xk8a2brpzfxi87mqqfv8l5xi5j9x71cy0ik64dzwcq7ka16gpz1";
};

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

src = fetchurl {
url =
@@ -65,9 +65,9 @@ stdenv.mkDerivation rec {
"https://fpdownload.macromedia.com/pub/flashplayer/updaters/29/flash_player_sa_linux.x86_64.tar.gz";
sha256 =
if debug then
"12ackbfyh83f3ggvr8gs88f002glrymh2s2pfb5srbgdajrh0cyc"
"1gvfm4z46m2y39fswpzhx18dlwcxwwy5mins3kx2m425dgp76zd5"
else
"17xwsw13bq5s6mq4r22zhw99dx5xswzz83m7lvd9gl9ih78w7348";
"08a21c0l47w97xhwiby8j5055kl37ld5insfd459gz92d3f145fl";
};

nativeBuildInputs = [ unzip ];
2 changes: 1 addition & 1 deletion pkgs/applications/networking/irc/ii/default.nix
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
name = "ii-1.8";

src = fetchurl {
url = "http://dl.suckless.org/tools/${name}.tar.gz";
url = "https://dl.suckless.org/tools/${name}.tar.gz";
sha256 = "1lk8vjl7i8dcjh4jkg8h8bkapcbs465sy8g9c0chfqsywbmf3ndr";
};

2 changes: 1 addition & 1 deletion pkgs/applications/networking/irc/sic/default.nix
Original file line number Diff line number Diff line change
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {

makeFlags = "PREFIX=$(out)";
src = fetchurl {
url = "http://dl.suckless.org/tools/sic-${version}.tar.gz";
url = "https://dl.suckless.org/tools/sic-${version}.tar.gz";
sha256 = "ac07f905995e13ba2c43912d7a035fbbe78a628d7ba1c256f4ca1372fb565185";
};

2 changes: 1 addition & 1 deletion pkgs/applications/window-managers/dwm/default.nix
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@ stdenv.mkDerivation {
inherit name;

src = fetchurl {
url = "http://dl.suckless.org/dwm/${name}.tar.gz";
url = "https://dl.suckless.org/dwm/${name}.tar.gz";
sha256 = "1zkmwb6df6m254shx06ly90c0q4jl70skk1pvkixpb7hcxhwbxn2";
};

4 changes: 2 additions & 2 deletions pkgs/applications/window-managers/tabbed/default.nix
Original file line number Diff line number Diff line change
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
name = "tabbed-20160425";

src = fetchgit {
url = http://git.suckless.org/tabbed;
url = https://git.suckless.org/tabbed;
rev = "bc236142fa72d2f9d6b5c790d3f3a9a9168a7164";
sha256 = "1fiv57g3jnlhnb6zrzl3n6lnpn2s9s0sd7bcv7r1nb3grwy7icri";
};
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
];

meta = {
homepage = http://tools.suckless.org/tabbed;
homepage = https://tools.suckless.org/tabbed;
description = "Simple generic tabbed fronted to xembed aware applications";
license = licenses.mit;
maintainers = with maintainers; [ viric vrthra ];
2 changes: 1 addition & 1 deletion pkgs/applications/window-managers/velox/dmenu.nix
Original file line number Diff line number Diff line change
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {

meta = {
description = "A generic, highly customizable, and efficient menu for the X Window System";
homepage = http://tools.suckless.org/dmenu;
homepage = https://tools.suckless.org/dmenu;
license = stdenv.lib.licenses.mit;
maintainers = with stdenv.lib.maintainers; [ ];
platforms = with stdenv.lib.platforms; all;
2 changes: 1 addition & 1 deletion pkgs/applications/window-managers/velox/st.nix
Original file line number Diff line number Diff line change
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;

meta = {
homepage = http://st.suckless.org/;
homepage = https://st.suckless.org/;
license = licenses.mit;
maintainers = with maintainers; [ ];
platforms = with platforms; linux;
2 changes: 1 addition & 1 deletion pkgs/development/libraries/farbfeld/default.nix
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
version = "3";

src = fetchgit {
url = "http://git.suckless.org/farbfeld";
url = "https://git.suckless.org/farbfeld";
rev = "refs/tags/${version}";
sha256 = "1k9cnw2zk9ywcn4hibf7wgi4czwyxhgjdmia6ghpw3wcz8vi71xl";
};
6 changes: 3 additions & 3 deletions pkgs/misc/screensavers/slock/default.nix
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{ stdenv, lib, fetchurl, writeText
, xproto, libX11, libXext, libXrandr
# default header can be obtained from
# http://git.suckless.org/slock/tree/config.def.h
# https://git.suckless.org/slock/tree/config.def.h
, conf ? null }:

with stdenv.lib;
stdenv.mkDerivation rec {
name = "slock-1.4";

src = fetchurl {
url = "http://dl.suckless.org/tools/${name}.tar.gz";
url = "https://dl.suckless.org/tools/${name}.tar.gz";
sha256 = "0sif752303dg33f14k6pgwq2jp1hjyhqv6x4sy3sj281qvdljf5m";
};

@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
'';

meta = {
homepage = http://tools.suckless.org/slock;
homepage = https://tools.suckless.org/slock;
description = "Simple X display locker";
longDescription = ''
Simple X display locker. This is the simplest X screen locker.
4 changes: 2 additions & 2 deletions pkgs/os-specific/linux/sinit/default.nix
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@ let
baseName="sinit";
version="1.0";
name="${baseName}-${version}";
url="http://git.suckless.org/sinit/";
url="https://git.suckless.org/sinit/";
sha256="0cf8yylgrrj1wxm5v6jdlbnxpx97m38yxrc9nmv1l8hldjqsj9pc";
rev = "refs/tags/v${version}";
};
@@ -32,6 +32,6 @@ stdenv.mkDerivation {
maintainers = [stdenv.lib.maintainers.raskin];
platforms = stdenv.lib.platforms.linux;
homepage = https://tools.suckless.org/sinit;
downloadPage = "http://git.suckless.org/sinit";
downloadPage = "https://git.suckless.org/sinit";
};
}
2 changes: 1 addition & 1 deletion pkgs/tools/X11/sselp/default.nix
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
name = "sselp-${version}";

src = fetchurl {
url = "http://dl.suckless.org/tools/${name}.tar.gz";
url = "https://dl.suckless.org/tools/${name}.tar.gz";
sha256 = "08mqp00lrh1chdrbs18qr0xv63h866lkmfj87kfscwdm1vn9a3yd";
};