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: 2936d1051e55
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: 364d47723692
Choose a head ref

Commits on Oct 3, 2018

  1. mtools: 4.0.18 -> 4.0.19

    Semi-automatic update generated by
    https://github.com/ryantm/nixpkgs-update tools. This update was made
    based on information from
    https://repology.org/metapackage/mtools/versions
    r-ryantm committed Oct 3, 2018
    Copy the full SHA
    aee3689 View commit details
  2. dar: 2.5.16 -> 2.5.17

    Semi-automatic update generated by
    https://github.com/ryantm/nixpkgs-update tools. This update was made
    based on information from
    https://repology.org/metapackage/dar/versions
    r-ryantm committed Oct 3, 2018
    Copy the full SHA
    fe071ae View commit details
  3. acpica-tools: 20180810 -> 20180927

    Semi-automatic update generated by
    https://github.com/ryantm/nixpkgs-update tools. This update was made
    based on information from
    https://repology.org/metapackage/acpica-tools/versions
    r-ryantm committed Oct 3, 2018
    Copy the full SHA
    cded34d View commit details

Commits on Oct 6, 2018

  1. aws-rotate-key: 1.0.0 -> 1.0.3

    mbode committed Oct 6, 2018
    Copy the full SHA
    1cfe58e View commit details
  2. Merge pull request #47607 from mbode/aws-rotate-key_1_0_2

    aws-rotate-key: 1.0.0 -> 1.0.3
    c0bw3b authored Oct 6, 2018

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    vbgl Vincent Laporte
    Copy the full SHA
    d27fc43 View commit details
  3. Merge pull request #47817 from r-ryantm/auto-update/dar

    dar: 2.5.16 -> 2.5.17
    c0bw3b authored Oct 6, 2018
    Copy the full SHA
    e4a7c56 View commit details
  4. Merge pull request #47825 from r-ryantm/auto-update/acpica-tools

    acpica-tools: 20180810 -> 20180927
    c0bw3b authored Oct 6, 2018

    Unverified

    The committer email address is not verified.
    Copy the full SHA
    d8e36e5 View commit details
  5. Merge pull request #47750 from r-ryantm/auto-update/mtools

    mtools: 4.0.18 -> 4.0.19
    c0bw3b authored Oct 6, 2018

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    jluttine Jaakko Luttinen
    Copy the full SHA
    e82162c View commit details
  6. tor-browser-bundle-bin: 8.0.1 -> 8.0.2

    Update to latest version due to security updates and 8.0.1 not being
    available on the mirrors anymore.
    
    Release notes: https://blog.torproject.org/new-release-tor-browser-802
    andir committed Oct 6, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    jtojnar Jan Tojnar
    Copy the full SHA
    248ed35 View commit details
  7. black: 18.6b4 -> 18.9b0 (#47914)

    pmiddend authored and xeji committed Oct 6, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    jtojnar Jan Tojnar
    Copy the full SHA
    d2608d2 View commit details
  8. telepresence: 0.85 -> 0.93 (#47966)

    offlinehacker authored and xeji committed Oct 6, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    a134b9a View commit details
  9. dateutils: 0.4.4 -> 0.4.5 (#47961)

    datezone needs TZdata
    + enabling parallel building
    + run the tests suite
    c0bw3b authored and xeji committed Oct 6, 2018
    Copy the full SHA
    0f283b4 View commit details
  10. eolie: 0.9.37 -> 0.9.41 (#47942)

    worldofpeace authored and xeji committed Oct 6, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    e5bea72 View commit details
  11. antibody: 3.6.1 -> 3.7.0 (#47943)

    worldofpeace authored and xeji committed Oct 6, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    5c2059d View commit details
  12. solargraph: 0.28.1 -> 0.28.2 (#47944)

    worldofpeace authored and xeji committed Oct 6, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    f368e55 View commit details
  13. Copy the full SHA
    fa3ec9c View commit details
  14. facter: 3.11.4 -> 3.12.0 (#47804)

    Semi-automatic update generated by
    https://github.com/ryantm/nixpkgs-update tools. This update was made
    based on information from
    https://repology.org/metapackage/facter/versions
    r-ryantm authored and xeji committed Oct 6, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    vcunat Vladimír Čunát
    Copy the full SHA
    b2f7b14 View commit details
  15. guake: 3.3.2 -> 3.4.0 (#47795)

    Semi-automatic update generated by
    https://github.com/ryantm/nixpkgs-update tools. This update was made
    based on information from
    https://repology.org/metapackage/guake/versions
    r-ryantm authored and xeji committed Oct 6, 2018
    Copy the full SHA
    310df54 View commit details
  16. bubblewrap: remove maintainership (#47970)

    konimex authored and xeji committed Oct 6, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    1b97c37 View commit details
  17. duc: 1.4.3 -> 1.4.4 (#47824)

    Semi-automatic update generated by
    https://github.com/ryantm/nixpkgs-update tools. This update was made
    based on information from
    https://repology.org/metapackage/duc/versions
    r-ryantm authored and xeji committed Oct 6, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    3281c90 View commit details
  18. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    963dcd9 View commit details
  19. ocamlPackages.ezxmlm: init at 1.0.2

    carlosdagos authored and vbgl committed Oct 6, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    364d477 View commit details
4 changes: 2 additions & 2 deletions pkgs/applications/misc/guake/default.nix
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@
, gtk3, keybinder3, libnotify, libutempter, vte }:

let
version = "3.3.2";
version = "3.4.0";
in python3.pkgs.buildPythonApplication rec {
name = "guake-${version}";
format = "other";
@@ -11,7 +11,7 @@ in python3.pkgs.buildPythonApplication rec {
owner = "Guake";
repo = "guake";
rev = version;
sha256 = "0cz58wfsa66j01sqpka7908ilj5ch3jdxaxzqdi8yspqwzz5iwc7";
sha256 = "1j38z968ha8ij6wrgbwvr8ad930nvhybm9g7pf4s4zv6d3vln0vm";
};

nativeBuildInputs = [ gettext gobjectIntrospection wrapGAppsHook python3.pkgs.pip glibcLocales ];
4 changes: 2 additions & 2 deletions pkgs/applications/networking/browsers/eolie/default.nix
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@

python3.pkgs.buildPythonApplication rec {
name = "eolie-${version}";
version = "0.9.37";
version = "0.9.41";

format = "other";
doCheck = false;
@@ -14,7 +14,7 @@ python3.pkgs.buildPythonApplication rec {
url = "https://gitlab.gnome.org/World/eolie";
rev = "refs/tags/${version}";
fetchSubmodules = true;
sha256 = "0la458zgh943wmgbzr9fpq78c0n11a2wm7rmks7ispk0719f6lxz";
sha256 = "0qrbgyzhvh96d7h2rcz04m7am6av30pcvb3fwlrjx0c402rslsx8";
};

nativeBuildInputs = [
Original file line number Diff line number Diff line change
@@ -103,7 +103,7 @@ let
fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ];

# Upstream source
version = "8.0.1";
version = "8.0.2";

lang = "en-US";

@@ -113,15 +113,15 @@ let
"https://github.com/TheTorProject/gettorbrowser/releases/download/v${version}/tor-browser-linux64-${version}_${lang}.tar.xz"
"https://dist.torproject.org/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz"
];
sha256 = "05k914066pk11qxbwr77g6v20cfc8h9mh9yc3bpsfy35p8sypv8c";
sha256 = "1vajphnl53bhp0bnq8shljvnnq4k2wpvfrfclmxklp97lqvfl9vz";
};

"i686-linux" = fetchurl {
urls = [
"https://github.com/TheTorProject/gettorbrowser/releases/download/v${version}/tor-browser-linux32-${version}_${lang}.tar.xz"
"https://dist.torproject.org/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz"
];
sha256 = "1w2apsiimy6d5vpql37j5bmf8y8xhx4irryd5ad3vqqsr0x5wla7";
sha256 = "157yd8n53w79xx58xf5v983a50xq1s0c09cr7qfd5cxgs7zrwh34";
};
};
in
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{ stdenv, lib, fetchurl, dpkg, makeDesktopItem, gnome2, gtk2, atk, cairo, pango, gdk_pixbuf, glib
{ stdenv, fetchurl, dpkg, makeDesktopItem, gnome2, gtk2, atk, cairo, pango, gdk_pixbuf, glib
, freetype, fontconfig, dbus, libnotify, libX11, xorg, libXi, libXcursor, libXdamage
, libXrandr, libXcomposite, libXext, libXfixes, libXrender, libXtst, libXScrnSaver
, nss, nspr, alsaLib, cups, expat, udev, xdg_utils, hunspell
, nss, nspr, alsaLib, cups, expat, udev, xdg_utils, hunspell, pulseaudio, pciutils
}:
let
rpath = lib.makeLibraryPath [
rpath = stdenv.lib.makeLibraryPath [
alsaLib
atk
cairo
@@ -17,7 +17,6 @@ let
glib
gnome2.GConf
gtk2
pango
hunspell
libnotify
libX11
@@ -33,22 +32,25 @@ let
libXtst
nspr
nss
pango
pciutils
pulseaudio
stdenv.cc.cc
udev
xdg_utils
xorg.libxcb
];

version = "3.2.2840";
version = "3.3.2872";

plat = {
"i686-linux" = "i386";
"x86_64-linux" = "amd64";
}.${stdenv.hostPlatform.system};

sha256 = {
"i686-linux" = "071ddh2d8wmiybwafwyb97962zj358l0fq7g2r44231653sgybvq";
"x86_64-linux" = "0qp9ms94smnm7k47b0n0jdzvnm1b7gj25hyinsfc6lghrb6jqw3r";
"i686-linux" = "16dw4ycajxviqrf4i32rkrhg1j1mdkmk252y8vjwr18xlyn958qb";
"x86_64-linux" = "04ysk91h2izyb41b243zki4j08bis9yzjq2va9bakp1lv6ywm8pw";
}.${stdenv.hostPlatform.system};

in
@@ -74,31 +76,31 @@ in
nativeBuildInputs = [ dpkg ];
unpackPhase = "dpkg-deb -x $src .";
installPhase = ''
mkdir -p $out
cp -R opt $out
cp -R usr/share $out/share
mkdir -p "$out"
cp -R "opt" "$out"
cp -R "usr/share" "$out/share"
chmod -R g-w $out
chmod -R g-w "$out"
# Patch signal
# Patch wire-desktop
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
--set-rpath "${rpath}:$out/opt/wire-desktop" \
"$out/opt/wire-desktop/wire-desktop"
--set-rpath "${rpath}:$out/opt/Wire" \
"$out/opt/Wire/wire-desktop"
# Symlink to bin
mkdir -p $out/bin
ln -s "$out/opt/wire-desktop/wire-desktop" $out/bin/wire-desktop
mkdir -p "$out/bin"
ln -s "$out/opt/Wire/wire-desktop" "$out/bin/wire-desktop"
# Desktop file
mkdir -p $out/share/applications
cp ${desktopItem}/share/applications/* $out/share/applications
mkdir -p "$out/share/applications"
cp ${desktopItem}/share/applications/* "$out/share/applications"
'';

meta = {
meta = with stdenv.lib; {
description = "A modern, secure messenger";
homepage = https://wire.com/;
license = lib.licenses.gpl3;
maintainers = with lib.maintainers; [ worldofpeace ];
platforms = [ "i686-linux" "x86_64-linux" ];
license = licenses.gpl3;
maintainers = with maintainers; [ worldofpeace ];
platforms = [ "i686-linux" "x86_64-linux" ];
};
}
40 changes: 40 additions & 0 deletions pkgs/development/ocaml-modules/ezxmlm/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
{ stdenv, fetchFromGitHub, ocaml, findlib, dune, xmlm }:

stdenv.mkDerivation rec {
version = "1.0.2";
name = "ocaml${ocaml.version}-ezxmlm-${version}";

src = fetchFromGitHub {
owner = "avsm";
repo = "ezxmlm";
rev = "v${version}";
sha256 = "1dgr61f0hymywikn67inq908x5adrzl3fjx3v14l9k46x7kkacl9";
};

propagatedBuildInputs = [ xmlm ];

buildInputs = [ ocaml findlib dune ];

buildFlags = "build";

inherit (dune) installPhase;

meta = with stdenv.lib; {
description = "Combinators to use with xmlm for parsing and selection";
longDescription = ''
An "easy" interface on top of the xmlm library. This version provides
more convenient (but far less flexible) input and output functions
that go to and from [string] values. This avoids the need to write signal
code, which is useful for quick scripts that manipulate XML.
More advanced users should go straight to the Xmlm library and use it
directly, rather than be saddled with the Ezxmlm interface. Since the
types in this library are more specific than Xmlm, it should interoperate
just fine with it if you decide to switch over.
'';
maintainers = [ maintainers.carlosdagos ];
inherit (src.meta) homepage;
inherit (ocaml.meta) platforms;
license = licenses.isc;
};
}
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/black/default.nix
Original file line number Diff line number Diff line change
@@ -4,13 +4,13 @@

buildPythonPackage rec {
pname = "black";
version = "18.6b4";
version = "18.9b0";

disabled = pythonOlder "3.6";

src = fetchPypi {
inherit pname version;
sha256 = "0i4sfqgz6w15vd50kbhi7g7rifgqlf8yfr8y78rypd56q64qn592";
sha256 = "1992ramdwv8sg4mbl5ajirwj5i4a48zjgsycib0fnbaliyiajc70";
};

checkInputs = [ pytest glibcLocales ];
3 changes: 3 additions & 0 deletions pkgs/development/python-modules/pyls-black/default.nix
Original file line number Diff line number Diff line change
@@ -19,6 +19,9 @@ buildPythonPackage rec {
pytest
'';

# Enable when https://github.com/rupert/pyls-black/pull/6 is merged.
doCheck = false;

checkInputs = [ pytest ];

propagatedBuildInputs = [ black toml python-language-server ];
6 changes: 3 additions & 3 deletions pkgs/development/ruby-modules/solargraph/Gemfile.lock
Original file line number Diff line number Diff line change
@@ -8,7 +8,7 @@ GEM
jaro_winkler (1.5.1)
kramdown (1.17.0)
mini_portile2 (2.3.0)
nokogiri (1.8.4)
nokogiri (1.8.5)
mini_portile2 (~> 2.3.0)
parallel (1.12.1)
parser (2.5.1.2)
@@ -17,7 +17,7 @@ GEM
rainbow (3.0.0)
reverse_markdown (1.1.0)
nokogiri
rubocop (0.59.1)
rubocop (0.59.2)
jaro_winkler (~> 1.5.1)
parallel (~> 1.10)
parser (>= 2.5, != 2.5.1.1)
@@ -26,7 +26,7 @@ GEM
ruby-progressbar (~> 1.7)
unicode-display_width (~> 1.0, >= 1.0.1)
ruby-progressbar (1.10.0)
solargraph (0.28.1)
solargraph (0.28.2)
coderay (~> 1.1)
eventmachine (~> 1.2, >= 1.2.5)
htmlentities (~> 4.3, >= 4.3.4)
12 changes: 6 additions & 6 deletions pkgs/development/ruby-modules/solargraph/gemset.nix
Original file line number Diff line number Diff line change
@@ -59,10 +59,10 @@
dependencies = ["mini_portile2"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1h9nml9h3m0mpvmh8jfnqvblnz5n5y3mmhgfc38avfmfzdrq9bgc";
sha256 = "0byyxrazkfm29ypcx5q4syrv126nvjnf7z6bqi01sqkv4llsi4qz";
type = "gem";
};
version = "1.8.4";
version = "1.8.5";
};
parallel = {
source = {
@@ -110,10 +110,10 @@
dependencies = ["jaro_winkler" "parallel" "parser" "powerpack" "rainbow" "ruby-progressbar" "unicode-display_width"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0hz4slfisbq8nqs83mvvh6yv5hb7z7zx9fxvv9cka6b9ldvr2i2b";
sha256 = "0110r4yqi6nn97bp2myah76plv6a7daxnm9k04k64n1y4zpqm256";
type = "gem";
};
version = "0.59.1";
version = "0.59.2";
};
ruby-progressbar = {
source = {
@@ -127,10 +127,10 @@
dependencies = ["coderay" "eventmachine" "htmlentities" "kramdown" "parser" "reverse_markdown" "rubocop" "thor" "tilt" "yard"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "11l759mrzjla2iqy5wdd20r01196pfxkw0b0gzgskdbfi8y8mvg5";
sha256 = "0xvxifq5871fh2c34hjvsqn38nw4s63d599vbs5mlrrvdl3c5s01";
type = "gem";
};
version = "0.28.1";
version = "0.28.2";
};
thor = {
source = {
15 changes: 9 additions & 6 deletions pkgs/servers/sql/mariadb/default.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, cmake, pkgconfig, ncurses, zlib, xz, lzo, lz4, bzip2, snappy
{ stdenv, fetchurl, fetchFromGitHub, cmake, pkgconfig, ncurses, zlib, xz, lzo, lz4, bzip2, snappy
, libiconv, openssl, pcre, boost, judy, bison, libxml2
, libaio, libevent, jemalloc, cracklib, systemd, numactl, perl
, fixDarwinDylibNames, cctools, CoreServices
@@ -221,11 +221,14 @@ connector-c = stdenv.mkDerivation rec {

galera = stdenv.mkDerivation rec {
name = "mariadb-galera-${version}";
version = "25.3.23";

src = fetchurl {
url = "https://mirrors.nxthost.com/mariadb/mariadb-10.2.14/galera-${version}/src/galera-${version}.tar.gz";
sha256 = "11pfc85z29jk0h6g6bmi3hdv4in4yb00xsr2r0qm1b0y7m2wq3ra";
version = "25.3.24";

src = fetchFromGitHub {
owner = "codership";
repo = "galera";
rev = "release_${version}";
sha256 = "1yx3rqy7r4w2l3hnrri30hvsa296v8xidi18p5fdzcpmnhnlwjbi";
fetchSubmodules = true;
};

buildInputs = [ asio boost check openssl scons ];
4 changes: 2 additions & 2 deletions pkgs/shells/zsh/antibody/default.nix
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@

buildGoPackage rec {
name = "antibody-${version}";
version = "3.6.1";
version = "3.7.0";
rev = "v${version}";

goPackagePath = "github.com/getantibody/antibody";
@@ -11,7 +11,7 @@ buildGoPackage rec {
inherit rev;
owner = "getantibody";
repo = "antibody";
sha256 = "1xlaf3440hs1ffa23ja0fc185sj0rxjv0808ib8li3rq2qfkd0k8";
sha256 = "1c7f0b1lgl4pm3cs39kr6dgr19lfykjhamg74k5ryrizag0j68l5";
};

goDeps = ./deps.nix;
4 changes: 2 additions & 2 deletions pkgs/tools/admin/aws-rotate-key/default.nix
Original file line number Diff line number Diff line change
@@ -2,15 +2,15 @@

buildGoPackage rec {
name = "aws-rotate-key-${version}";
version = "1.0.0";
version = "1.0.3";

goPackagePath = "github.com/Fullscreen/aws-rotate-key";

src = fetchFromGitHub {
rev = "v${version}";
owner = "Fullscreen";
repo = "aws-rotate-key";
sha256 = "13q7rns65cj8b4i0s75dbswijpra9z74b462zribwfjdm29by5k1";
sha256 = "15na7flc0vp14amaq3116a5glqlb4ydvdlzv0q7mwl73pc38zxn3";
};

goDeps = ./deps.nix;
2 changes: 1 addition & 1 deletion pkgs/tools/admin/bubblewrap/default.nix
Original file line number Diff line number Diff line change
@@ -15,6 +15,6 @@ stdenv.mkDerivation rec {
description = "Unprivileged sandboxing tool";
homepage = https://github.com/projectatomic/bubblewrap;
license = licenses.lgpl2Plus;
maintainers = with maintainers; [ konimex ];
maintainers = with maintainers; [ ];
};
}
4 changes: 2 additions & 2 deletions pkgs/tools/backup/dar/default.nix
Original file line number Diff line number Diff line change
@@ -3,12 +3,12 @@
with stdenv.lib;

stdenv.mkDerivation rec {
version = "2.5.16";
version = "2.5.17";
name = "dar-${version}";

src = fetchurl {
url = "mirror://sourceforge/dar/${name}.tar.gz";
sha256 = "0fy39y6kfda0lvbymc0dblvzmli5y9bq81q0r8fwjzd105qwjmz9";
sha256 = "1pw6l9nh7w9n7ysh8m6wdzr3k4i9sd6fkmrprnssay5cz7rsbx3v";
};

buildInputs = [ zlib bzip2 openssl lzo libgcrypt gpgme xz ]
4 changes: 2 additions & 2 deletions pkgs/tools/filesystems/mtools/default.nix
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{ stdenv, fetchurl }:

stdenv.mkDerivation rec {
name = "mtools-4.0.18";
name = "mtools-4.0.19";

src = fetchurl {
url = "mirror://gnu/mtools/${name}.tar.bz2";
sha256 = "119gdfnsxc6hzicnsf718k0fxgy2q14pxn7557rc96aki20czsar";
sha256 = "1pqhv5l4fqj1d3698vajkccz65xqxs3991wpylbw7hm1kqcrgh8v";
};

# Prevents errors such as "mainloop.c:89:15: error: expected ')'"
Loading