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: c268986263f0
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: 690ffb0a52d8
Choose a head ref

Commits on Aug 17, 2018

  1. nsd: 4.1.23 -> 4.1.24

    Semi-automatic update generated by
    https://github.com/ryantm/nixpkgs-update tools. This update was made
    based on information from
    https://repology.org/metapackage/nsd/versions.
    R. RyanTM committed Aug 17, 2018
    Copy the full SHA
    f82f933 View commit details
  2. checkstyle: 8.11 -> 8.12

    Semi-automatic update generated by
    https://github.com/ryantm/nixpkgs-update tools. This update was made
    based on information from
    https://repology.org/metapackage/checkstyle/versions.
    R. RyanTM committed Aug 17, 2018
    Copy the full SHA
    6573f3a View commit details

Commits on Aug 19, 2018

  1. feedgnuplot: fix build

    feedgnuplot has no devdoc.
    mnacamura committed Aug 19, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    NeQuissimus Tim Steinbach
    Copy the full SHA
    9e2755b View commit details
  2. ldc: 1.10.0 -> 1.11.0

    ThomasMader committed Aug 19, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    NeQuissimus Tim Steinbach
    Copy the full SHA
    ed5b194 View commit details
  3. dmd: 2.081.1 -> 2.081.2

    ThomasMader committed Aug 19, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    NeQuissimus Tim Steinbach
    Copy the full SHA
    89e4834 View commit details
  4. Verified

    This commit was signed with the committer’s verified signature.
    NeQuissimus Tim Steinbach
    Copy the full SHA
    4d0203d View commit details
  5. pythonPackages.nixpart0: fix nixops deploy

    re-introduce the unused "udevSoMajor" variable for nixops
    backward-compatibilty.
    
    This was removed by the treewide 52f53c6 cleanup
    zimbatm committed Aug 19, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    NeQuissimus Tim Steinbach
    Copy the full SHA
    2c35ea0 View commit details

Commits on Aug 20, 2018

  1. facette: 0.4.0 -> 0.4.1

    fgaz committed Aug 20, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    NeQuissimus Tim Steinbach
    Copy the full SHA
    fbab1a3 View commit details
  2. Merge pull request #45349 from zimbatm/fix-nixpart0-nixops

    pythonPackages.nixpart0: fix nixops deploy
    Mic92 authored Aug 20, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    NeQuissimus Tim Steinbach
    Copy the full SHA
    d73e7ef View commit details
  3. Merge pull request #45355 from ThomasMader/dlang-update

    ldc: 1.10.0 -> 1.11.0, dmd: 2.081.1 -> 2.081.2, dtools: 2.081.1 -> 2.081.2
    Mic92 authored Aug 20, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    NeQuissimus Tim Steinbach
    Copy the full SHA
    439c90b View commit details
  4. Merge pull request #45176 from r-ryantm/auto-update/nsd

    nsd: 4.1.23 -> 4.1.24
    hrdinka authored Aug 20, 2018
    Copy the full SHA
    613fdc4 View commit details
  5. mpd: 0.20.20 -> 0.20.21

    jfrankenau committed Aug 20, 2018
    Copy the full SHA
    f0a3544 View commit details
  6. mmc-utils: update to upstream

    Markov Dmitry committed Aug 20, 2018
    Copy the full SHA
    2ec1161 View commit details
  7. Merge pull request #45377 from jfrankenau/update-mpd

    mpd: 0.20.20 -> 0.20.21
    Mic92 authored Aug 20, 2018
    Copy the full SHA
    1df224d View commit details
  8. Copy the full SHA
    3cfc844 View commit details
  9. Literate: mark as broken

    Incompatible with our dlang compiler, see NixOS/nixpkgs#45355 (comment)
    Mic92 committed Aug 20, 2018
    Copy the full SHA
    bbf5f23 View commit details
  10. checkstyle: add wrapper in bin

    Mic92 committed Aug 20, 2018
    Copy the full SHA
    1b313a1 View commit details
  11. Merge pull request #45254 from r-ryantm/auto-update/checkstyle

    checkstyle: 8.11 -> 8.12
    Mic92 authored Aug 20, 2018
    Copy the full SHA
    a1ffd13 View commit details
  12. perlPackages.NetSFTPForeign: init at 1.89 (#45380)

    * added Net::SFTP::Foreign module from CPAN
    
    * missed patching binary path
    
    * fixed up the license
    aanderse authored and Mic92 committed Aug 20, 2018
    Copy the full SHA
    35b8140 View commit details
  13. gegl_0_4: 0.4.6 → 0.4.8

    jtojnar committed Aug 20, 2018
    Copy the full SHA
    2ba51ac View commit details
  14. gimp: 2.10.4 → 2.10.6

    jtojnar committed Aug 20, 2018
    Copy the full SHA
    4b60e77 View commit details
  15. facette: mark as broken since it requires internet

    It _is_ buildable, just not without an internet connection (like in hydra)
    fgaz committed Aug 20, 2018
    Copy the full SHA
    0e0e963 View commit details
  16. Merge pull request #45372 from fgaz/facette/0.4.0-0.4.1

    facette: 0.4.0 -> 0.4.1
    Mic92 authored Aug 20, 2018
    Copy the full SHA
    a4869cb View commit details
  17. Adding vdemeester (myself) as runc and containerd package maintainer

    Signed-off-by: Vincent Demeester <vincent@sbr.pm>
    vdemeester committed Aug 20, 2018
    Copy the full SHA
    2b36ced View commit details
  18. Merge pull request #45384 from vdemeester/add-vdemeester-as-container…

    …d-and-runc-maintainers
    
    Adding vdemeester (myself) as runc and containerd package maintainer
    Mic92 authored Aug 20, 2018
    Copy the full SHA
    996d76a View commit details
  19. Merge pull request #45338 from mnacamura/feedgnuplot

    feedgnuplot: fix build
    Mic92 authored Aug 20, 2018
    Copy the full SHA
    690ffb0 View commit details
8 changes: 4 additions & 4 deletions pkgs/applications/graphics/gimp/default.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, autoreconfHook, pkgconfig, intltool, babl, gegl, gtk2, glib, gdk_pixbuf, isocodes
{ stdenv, fetchurl, pkgconfig, intltool, babl, gegl, gtk2, glib, gdk_pixbuf, isocodes
, pango, cairo, freetype, fontconfig, lcms, libpng, libjpeg, poppler, poppler_data, libtiff
, libmng, librsvg, libwmf, zlib, libzip, ghostscript, aalib, shared-mime-info
, python2Packages, libexif, gettext, xorg, glib-networking, libmypaint, gexiv2
@@ -9,14 +9,14 @@ let
inherit (python2Packages) pygtk wrapPython python;
in stdenv.mkDerivation rec {
name = "gimp-${version}";
version = "2.10.4";
version = "2.10.6";

src = fetchurl {
url = "http://download.gimp.org/pub/gimp/v${stdenv.lib.versions.majorMinor version}/${name}.tar.bz2";
sha256 = "14pi0q3wwkapy0inqxk1hjsa2h8lff1z4wgdsyrk29jaw66pdc7z";
sha256 = "07qh2ljbza2mph1gh8sicn27qihhj8hx3ivvry2874cfh8ghgj2f";
};

nativeBuildInputs = [ autoreconfHook pkgconfig intltool gettext wrapPython ];
nativeBuildInputs = [ pkgconfig intltool gettext wrapPython ];
propagatedBuildInputs = [ gegl ]; # needed by gimp-2.0.pc
buildInputs = [
babl gegl gtk2 glib gdk_pixbuf pango cairo gexiv2 harfbuzz isocodes
2 changes: 1 addition & 1 deletion pkgs/applications/virtualization/containerd/default.nix
Original file line number Diff line number Diff line change
@@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
homepage = https://containerd.tools/;
description = "A daemon to control runC";
license = licenses.asl20;
maintainers = with maintainers; [ offline ];
maintainers = with maintainers; [ offline vdemeester ];
platforms = platforms.linux;
};
}
2 changes: 1 addition & 1 deletion pkgs/applications/virtualization/runc/default.nix
Original file line number Diff line number Diff line change
@@ -63,7 +63,7 @@ stdenv.mkDerivation rec {
homepage = https://runc.io/;
description = "A CLI tool for spawning and running containers according to the OCI specification";
license = licenses.asl20;
maintainers = with maintainers; [ offline ];
maintainers = with maintainers; [ offline vdemeester ];
platforms = platforms.linux;
};
}
8 changes: 4 additions & 4 deletions pkgs/development/compilers/dmd/default.nix
Original file line number Diff line number Diff line change
@@ -2,10 +2,10 @@
, makeWrapper, unzip, which
, curl, tzdata, gdb, darwin
, callPackage, targetPackages, ldc
, version ? "2.081.1"
, dmdSha256 ? "1xdz7p0pdzwkn57ai93mavgdkd8xb1sr2brlc6y3c12x84h43s8z"
, druntimeSha256 ? "1vl8ag6rjvqqmc5bn5jk3yfynjb9ggy3hw1awwl7c76bq4f7nbif"
, phobosSha256 ? "0h1jdc3yai1l42bxjdlyi9hf9qadh76v925rjk2q4ibv2fzl56b7"
, version ? "2.081.2"
, dmdSha256 ? "1wwk4shqldvgyczv1ihmljpfj3yidq7mxcj69i9kjl7jqx54hw62"
, druntimeSha256 ? "0dqfsy34q2q7mk2gsi4ix3vgqg7szg3m067fghgx53vnvrzlpsc0"
, phobosSha256 ? "1dan59lc4wggsrv5aax7jsxnzg7fz37xah84k1cbwjb3xxhhkd9n"
}:

let
4 changes: 2 additions & 2 deletions pkgs/development/compilers/ldc/default.nix
Original file line number Diff line number Diff line change
@@ -2,8 +2,8 @@
, python, libconfig, lit, gdb, unzip, darwin, bash
, callPackage, makeWrapper, targetPackages
, bootstrapVersion ? false
, version ? "1.10.0"
, ldcSha256 ? "0wc3vlblsz4qdwa9ay9plv9nvfd07zj2byqqffaa4a5gvjwf5dlr"
, version ? "1.11.0"
, ldcSha256 ? "0w4z261gzji31hn1xdnmi9dfkbyydpy6rz8aj4456q5w8yp4yil5"
}:

let
10 changes: 5 additions & 5 deletions pkgs/development/libraries/gegl/4.0.nix
Original file line number Diff line number Diff line change
@@ -3,18 +3,18 @@
, libwebp, gnome3, libintl }:

let
version = "0.4.6";
version = "0.4.8";
in stdenv.mkDerivation rec {
name = "gegl-${version}";

outputs = [ "out" "dev" "devdoc" ];
outputBin = "dev";

src = fetchurl {
url = "https://download.gimp.org/pub/gegl/${stdenv.lib.versions.majorMinor version}/${name}.tar.bz2";
sha256 = "1rcsa60z09jjayk0q6jam4w8rivh400a08bv2xykiv5qyr1yp5zk";
sha256 = "0jdfhf8wikba4h68k505x0br3gisiwivc33aca8v3ibaqpp6i53i";
};

# needs fonts otherwise, don't know how to pass them
configureFlags = [ "--disable-docs" ];

enableParallelBuilding = true;

doCheck = true;
17 changes: 11 additions & 6 deletions pkgs/development/tools/analysis/checkstyle/default.nix
Original file line number Diff line number Diff line change
@@ -1,19 +1,24 @@
{ stdenv, fetchurl }:
{ stdenv, fetchurl, makeWrapper, jre }:

stdenv.mkDerivation rec {
version = "8.11";
version = "8.12";
name = "checkstyle-${version}";

src = fetchurl {
url = "https://github.com/checkstyle/checkstyle/releases/download/checkstyle-${version}/checkstyle-${version}-all.jar";
sha256 = "13x4m4rn7rix64baclcm2jqbizkj38njif2ba0ycmvyjm62smfwv";
sha256 = "000048flqhkwnjn37bh07wgn6q4m12s3h3p9piqgvxswrjc95x3y";
};

phases = [ "installPhase" ];
nativeBuildInputs = [ makeWrapper jre ];

unpackPhase = ":";

installPhase = ''
mkdir -p $out/checkstyle
cp $src $out/checkstyle/checkstyle-all.jar
runHook preInstall
install -D $src $out/checkstyle/checkstyle-all.jar
makeWrapper ${jre}/bin/java $out/bin/checkstyle \
--add-flags "-jar $out/checkstyle/checkstyle-all.jar"
runHook postInstall
'';

meta = with stdenv.lib; {
4 changes: 2 additions & 2 deletions pkgs/development/tools/dtools/default.nix
Original file line number Diff line number Diff line change
@@ -2,14 +2,14 @@

stdenv.mkDerivation rec {
name = "dtools-${version}";
version = "2.081.1";
version = "2.081.2";

srcs = [
(fetchFromGitHub {
owner = "dlang";
repo = "dmd";
rev = "v${version}";
sha256 = "1xdz7p0pdzwkn57ai93mavgdkd8xb1sr2brlc6y3c12x84h43s8z";
sha256 = "1wwk4shqldvgyczv1ihmljpfj3yidq7mxcj69i9kjl7jqx54hw62";
name = "dmd";
})
(fetchFromGitHub {
Original file line number Diff line number Diff line change
@@ -18,5 +18,6 @@ stdenv.mkDerivation {
homepage = http://literate.zbyedidia.webfactional.com/;
license = licenses.mit;
platforms = platforms.unix;
broken = true; # 2018-08-20 (https://github.com/NixOS/nixpkgs/pull/45355#issuecomment-414285384)
};
}
6 changes: 3 additions & 3 deletions pkgs/os-specific/linux/mmc-utils/default.nix
Original file line number Diff line number Diff line change
@@ -2,12 +2,12 @@

stdenv.mkDerivation rec {
name = "mmc-utils-${version}";
version = "2015-11-18";
version = "2018-03-27";

src = fetchgit {
url = "git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc-utils.git";
rev = "44f94b925894577f9ffcf2c418dd013a5e582648";
sha256 = "0hkdzc71pdnscbpdpgwljcchiyancarldjyd0w609sy18bky833x";
rev = "b4fe0c8c0e57a74c01755fa9362703b60d7ee49d";
sha256 = "01llwan5j40mv5p867f31lm87qh0hcyhy892say60y5pxc0mzpyn";
};

makeFlags = "CC=${stdenv.cc.targetPrefix}cc";
4 changes: 2 additions & 2 deletions pkgs/servers/dns/nsd/default.nix
Original file line number Diff line number Diff line change
@@ -15,11 +15,11 @@
}:

stdenv.mkDerivation rec {
name = "nsd-4.1.23";
name = "nsd-4.1.24";

src = fetchurl {
url = "https://www.nlnetlabs.nl/downloads/nsd/${name}.tar.gz";
sha256 = "1zc59cj1851scwhwy3k6aals3fk13njyhda37k4a353bcyyxh3pn";
sha256 = "04ck8ia6xq1xqdk2g922262xywzd070pl4iad7c0lqclwk48gdjg";
};

prePatch = ''
5 changes: 3 additions & 2 deletions pkgs/servers/monitoring/facette/default.nix
Original file line number Diff line number Diff line change
@@ -3,12 +3,12 @@

stdenv.mkDerivation rec {
name = "facette-${version}";
version = "0.4.0";
version = "0.4.1";
src = fetchFromGitHub {
owner = "facette";
repo = "facette";
rev = "${version}";
sha256 = "1m7krq439qlf7b4l4bfjw0xfvjgj67w59mh8rf7c398rky04p257";
sha256 = "0p28s2vn18cqg8p7bzhb38wky0m98d5xv3wvf1nmg1kmwhwim6mi";
};
nativeBuildInputs = [ go pkgconfig nodejs nodePackages.npm pandoc ];
buildInputs = [ rrdtool ];
@@ -26,5 +26,6 @@ stdenv.mkDerivation rec {
homepage = https://facette.io/;
license = licenses.bsd3;
maintainers = with maintainers; [ fgaz ];
broken = true; # not really broken, it just requires an internet connection to build. see #45382
};
}
4 changes: 2 additions & 2 deletions pkgs/servers/mpd/default.nix
Original file line number Diff line number Diff line change
@@ -36,7 +36,7 @@ let
opt = stdenv.lib.optional;
mkFlag = c: f: if c then "--enable-${f}" else "--disable-${f}";
major = "0.20";
minor = "20";
minor = "21";

in stdenv.mkDerivation rec {
name = "mpd-${version}";
@@ -46,7 +46,7 @@ in stdenv.mkDerivation rec {
owner = "MusicPlayerDaemon";
repo = "MPD";
rev = "v${version}";
sha256 = "0v7xpsr8b4d0q9vh1wni0qbkbkxdjpn639qm2q553ckk5idas4lm";
sha256 = "0qchvycwiai5gwkvvf44nc1jw16yhpcjmlppqlrlvicgzsanhmy3";
};

patches = [ ./x86.patch ];
2 changes: 2 additions & 0 deletions pkgs/tools/filesystems/nixpart/0.4/default.nix
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
{ stdenv, fetchurl, python, buildPythonApplication
# Propagated to blivet
, useNixUdev ? true
# Needed by NixOps
, udevSoMajor ? null
# Propagated dependencies
, pkgs, urlgrabber
}:
2 changes: 2 additions & 0 deletions pkgs/tools/graphics/feedgnuplot/default.nix
Original file line number Diff line number Diff line change
@@ -19,6 +19,8 @@ buildPerlPackage rec {
sha256 = "1bjnx36rsxlj845w9apvdjpza8vd9rbs3dlmgvky6yznrwa6sm02";
};

outputs = [ "out" ];

nativeBuildInputs = [ makeWrapper gawk ];

buildInputs = [ gnuplot perl ]
16 changes: 16 additions & 0 deletions pkgs/top-level/perl-packages.nix
Original file line number Diff line number Diff line change
@@ -11370,6 +11370,22 @@ let
};
};

NetSFTPForeign = buildPerlPackage rec {
name = "Net-SFTP-Foreign-1.89";
src = fetchurl {
url = "mirror://cpan/authors/id/S/SA/SALVA/${name}.tar.gz";
sha256 = "9bd33e130581c1fc3eb6108eaf9056c1507428cace04a572f7afe816d83b08a7";
};
propagatedBuildInputs = [ pkgs.openssl ];
patchPhase = ''
sed -i "s|$ssh_cmd = 'ssh'|$ssh_cmd = '${pkgs.openssh}/bin/ssh'|" lib/Net/SFTP/Foreign/Backend/Unix.pm
'';
meta = {
description = "Secure File Transfer Protocol client";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
};
};

NetServerCoro = buildPerlPackage rec {
name = "Net-Server-Coro-1.3";
src = fetchurl {