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: 8c2c14ac392e
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: 11068c62a57d
Choose a head ref

Commits on Oct 2, 2018

  1. Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    angerman Moritz Angermann
    Copy the full SHA
    6e8da1d View commit details
  2. Copy the full SHA
    f7a2e20 View commit details

Commits on Oct 3, 2018

  1. emby: move usr/lib to lib

    nyanloutre committed Oct 3, 2018
    Copy the full SHA
    9ec17c6 View commit details
  2. cgal: 4.12.1 -> 4.13

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

Commits on Oct 4, 2018

  1. tetra-gtk-theme: 0.1.6 -> 0.2.0

    "October changes"
    dtzWill committed Oct 4, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    a78390c View commit details
  2. checkSSLCert: 1.72.0 -> 1.73.0

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

    Semi-automatic update generated by
    https://github.com/ryantm/nixpkgs-update tools. This update was made
    based on information from
    https://repology.org/metapackage/bowtie2/versions
    r-ryantm committed Oct 4, 2018
    Copy the full SHA
    269efba View commit details
  4. arangodb: 3.3.15 -> 3.3.16

    Semi-automatic update generated by
    https://github.com/ryantm/nixpkgs-update tools. This update was made
    based on information from
    https://repology.org/metapackage/arangodb/versions
    r-ryantm committed Oct 4, 2018
    Copy the full SHA
    2bc0d82 View commit details
  5. bfs: 1.2.3 -> 1.2.4

    Semi-automatic update generated by
    https://github.com/ryantm/nixpkgs-update tools. This update was made
    based on information from
    https://repology.org/metapackage/bfs/versions
    r-ryantm committed Oct 4, 2018
    Copy the full SHA
    f1e5eb5 View commit details
  6. babeld: 1.8.2 -> 1.8.3

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

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    38b284b View commit details
  7. bzflag: 2.4.14 -> 2.4.16

    Semi-automatic update generated by
    https://github.com/ryantm/nixpkgs-update tools. This update was made
    based on information from
    https://repology.org/metapackage/bzflag/versions
    r-ryantm committed Oct 4, 2018
    Copy the full SHA
    bd51db9 View commit details
  8. emby: move lib to opt

    nyanloutre committed Oct 4, 2018
    Copy the full SHA
    c2e269e View commit details
  9. yapf: 0.22.0 -> 0.24.0

    Philipp Middendorf committed Oct 4, 2018
    Copy the full SHA
    98238e5 View commit details
  10. elvish: provide the compiled version

    Without this fix, `elvish -version` displays "unknown"
    zimbatm committed Oct 4, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    9d49cf1 View commit details
  11. libinput: 0.12.0 -> 0.12.1

    dtzWill committed Oct 4, 2018
    Copy the full SHA
    7de7358 View commit details
  12. wine: 3.14 -> 3.15

    avnik committed Oct 4, 2018
    Copy the full SHA
    b839b25 View commit details
  13. wineUnstable: 3.15 -> 3.17

    Staging updated as well
    avnik committed Oct 4, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    3b67c0b View commit details
  14. Merge pull request #47867 from zimbatm/elvish-version

    elvish: provide the compiled version
    Mic92 authored Oct 4, 2018
    Copy the full SHA
    c67c243 View commit details
  15. iwd: 0.8 -> 0.9

    dywedir committed Oct 4, 2018
    Copy the full SHA
    9fe857d View commit details
  16. Merge pull request #47858 from plapadoo/yapf_0_24_0

    yapf: 0.22.0 -> 0.24.0
    Mic92 authored Oct 4, 2018
    Copy the full SHA
    c7b7eb3 View commit details
  17. Copy the full SHA
    2c3fff0 View commit details
  18. Merge pull request #47882 from dywedir/iwd

    iwd: 0.8 -> 0.9
    Mic92 authored Oct 4, 2018
    Copy the full SHA
    1ef0711 View commit details
  19. Merge pull request #47849 from r-ryantm/auto-update/bfs

    bfs: 1.2.3 -> 1.2.4
    Mic92 authored Oct 4, 2018
    Copy the full SHA
    4e180fd View commit details
  20. Merge pull request #47848 from r-ryantm/auto-update/arangodb

    arangodb: 3.3.15 -> 3.3.16
    Mic92 authored Oct 4, 2018
    Copy the full SHA
    b0b73aa View commit details
  21. Merge pull request #47850 from r-ryantm/auto-update/babeld

    babeld: 1.8.2 -> 1.8.3
    Mic92 authored Oct 4, 2018
    Copy the full SHA
    023b006 View commit details
  22. Merge pull request #47843 from r-ryantm/auto-update/check_ssl_cert

    checkSSLCert: 1.72.0 -> 1.73.0
    Mic92 authored Oct 4, 2018
    Copy the full SHA
    2023ac5 View commit details
  23. Merge pull request #47841 from dtzWill/update/tetra-gtk-theme-0.2.0

    tetra-gtk-theme: 0.1.6 -> 0.2.0
    Mic92 authored Oct 4, 2018
    Copy the full SHA
    429b3ce View commit details
  24. Merge pull request #47845 from r-ryantm/auto-update/bowtie2

    bowtie2: 2.3.4.2 -> 2.3.4.3
    Mic92 authored Oct 4, 2018
    Copy the full SHA
    a24cf5c View commit details
  25. Merge pull request #47852 from r-ryantm/auto-update/bzflag

    bzflag: 2.4.14 -> 2.4.16
    Mic92 authored Oct 4, 2018
    Copy the full SHA
    c9717dd View commit details
  26. kubernetes-helm: 2.10.0 -> 2.11.0

    * kubernetes-helm: 2.10.0 -> 2.11.0
    
    Semi-automatic update generated by
    https://github.com/ryantm/nixpkgs-update tools. This update was made
    based on information from
    https://repology.org/metapackage/helm/versions
    
    * kubernetes-helm: 2.10.0 -> 2.11.0 (fix darwin hash)
    r-ryantm authored and nlewo committed Oct 4, 2018
    Copy the full SHA
    07ace1d View commit details
  27. Merge pull request #47879 from avnik/wine-update

    Wine update
    lukateras authored Oct 4, 2018
    Copy the full SHA
    9d27fb9 View commit details
  28. Merge pull request #47870 from dtzWill/update/libinput-0.12.1

    libinput: 0.12.0 -> 0.12.1
    lukateras authored Oct 4, 2018
    Copy the full SHA
    ca45028 View commit details
  29. Merge pull request #47826 from r-ryantm/auto-update/cgal

    cgal: 4.12.1 -> 4.13
    7c6f434c authored Oct 4, 2018
    Copy the full SHA
    bc46aa9 View commit details
  30. terraform: add plugins tests (#47861)

    I wasn't sure if the plugins were downloaded from the Internet or not.
    This makes sure that there is no regression in the plugin detection.
    zimbatm authored Oct 4, 2018
    Copy the full SHA
    d4ff6ca View commit details
  31. Merge pull request #47659 from nyanloutre/emby-3.5.3.0

    emby: 3.5.2.0 -> 3.5.3.0, migrate from mono to dotnet
    timokau authored Oct 4, 2018
    Copy the full SHA
    11068c6 View commit details
6 changes: 3 additions & 3 deletions pkgs/applications/editors/android-studio/default.nix
Original file line number Diff line number Diff line change
@@ -14,9 +14,9 @@ let
};
betaVersion = stableVersion;
latestVersion = { # canary & dev
version = "3.3.0.11"; # "Android Studio 3.3 Canary 12"
build = "182.5026711";
sha256Hash = "0k1f8yw3gdil78iqxlwhbz71w1307hwwf8z9m7hs0v9b4ri6x2wk";
version = "3.3.0.12"; # "Android Studio 3.3 Canary 13"
build = "182.5035453";
sha256Hash = "0f2glxm41ci016dv9ygr12s72lc5mh0zsxhpmx0xswg9mdwrvwa7";
};
in rec {
# Old alias
6 changes: 3 additions & 3 deletions pkgs/applications/networking/cluster/helm/default.nix
Original file line number Diff line number Diff line change
@@ -5,10 +5,10 @@ let
then "linux-amd64"
else "darwin-amd64";
checksum = if isLinux
then "1zig6ihmxcaw2wsbdd85yf1zswqcifw0hvbp1zws7r5ihd4yv8hg"
else "1l8y9i8vhibhwbn5kn5qp722q4dcx464kymlzy2bkmhiqbxnnkkw";
then "18bk4zqdxdrdcl34qay5mpzzywy9srmpz3mm91l0za6nhqapb902"
else "03xb73769awc6dpvz86nqm9fbgp3yrw30kf5lphf76klk2ii66sm";
pname = "helm";
version = "2.10.0";
version = "2.11.0";
in
stdenv.mkDerivation {
name = "${pname}-${version}";
23 changes: 23 additions & 0 deletions pkgs/applications/networking/cluster/terraform/default.nix
Original file line number Diff line number Diff line change
@@ -4,6 +4,8 @@
, buildGoPackage
, fetchFromGitHub
, makeWrapper
, runCommand
, writeText
, terraform-providers
}:

@@ -118,4 +120,25 @@ in rec {
});

terraform_0_11-full = terraform_0_11.withPlugins lib.attrValues;

# Tests that the plugins are being used. Terraform looks at the specific
# file pattern and if the plugin is not found it will try to download it
# from the Internet. With sandboxing enable this test will fail if that is
# the case.
terraform_plugins_test = let
mainTf = writeText "main.tf" ''
resource "random_id" "test" {}
'';
terraform = terraform_0_11.withPlugins (p: [ p.random ]);
test = runCommand "terraform-plugin-test" { buildInputs = [terraform]; }
''
set -e
# make it fail outside of sandbox
export HTTP_PROXY=http://127.0.0.1:0 HTTPS_PROXY=https://127.0.0.1:0
cp ${mainTf} main.tf
terraform init
touch $out
'';
in test;

}
4 changes: 2 additions & 2 deletions pkgs/applications/science/biology/bowtie2/default.nix
Original file line number Diff line number Diff line change
@@ -2,14 +2,14 @@

stdenv.mkDerivation rec {
pname = "bowtie2";
version = "2.3.4.2";
version = "2.3.4.3";
name = "${pname}-${version}";

src = fetchFromGitHub {
owner = "BenLangmead";
repo = pname;
rev = "v${version}";
sha256 = "1gsfaf7rjg4nwhs7vc1vf63xd5r5v1yq58w7x3barycplzbvixzz";
sha256 = "1zl3cf327y2p7p03cavymbh7b00djc7lncfaqih33n96iy9q8ibp";
};

buildInputs = [ zlib tbb ];
4 changes: 2 additions & 2 deletions pkgs/development/libraries/CGAL/default.nix
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{ stdenv, fetchFromGitHub, cmake, boost, gmp, mpfr }:

stdenv.mkDerivation rec {
version = "4.12.1";
version = "4.13";
name = "cgal-" + version;

src = fetchFromGitHub {
owner = "CGAL";
repo = "releases";
rev = "CGAL-${version}";
sha256 = "0b8wwfnvbayxi18jahfdplkjqr59ynq6phk0kz62gqp8vmwia9d9";
sha256 = "1gzfz0fz7q5qyhzwfl3n1f5jrqa1ijq9kjjms7hb0ywpagipq6ax";
};

# note: optional component libCGAL_ImageIO would need zlib and opengl;
4 changes: 2 additions & 2 deletions pkgs/development/libraries/libinput/default.nix
Original file line number Diff line number Diff line change
@@ -16,11 +16,11 @@ in
with stdenv.lib;
stdenv.mkDerivation rec {
name = "libinput-${version}";
version = "1.12.0";
version = "1.12.1";

src = fetchurl {
url = "https://www.freedesktop.org/software/libinput/${name}.tar.xz";
sha256 = "1901wxh9k8kz3krfmvacf8xa8r4idfyisw8d80a2ql0bxiw2pb0m";
sha256 = "14l6bvgq76ls63qc9c448r435q9xiig0rv8ilx6rnjvlgg64h32p";
};

outputs = [ "bin" "out" "dev" ];
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/yapf/default.nix
Original file line number Diff line number Diff line change
@@ -2,11 +2,11 @@

buildPythonPackage rec {
pname = "yapf";
version = "0.22.0";
version = "0.24.0";

src = fetchPypi {
inherit pname version;
sha256 = "a98a6eacca64d2b920558f4a2f78150db9474de821227e60deaa29f186121c63";
sha256 = "0anwby0ydmyzcsgjc5dn1ryddwvii4dq61vck447q0n96npnzfyf";
};

meta = with stdenv.lib; {
4 changes: 2 additions & 2 deletions pkgs/games/bzflag/default.nix
Original file line number Diff line number Diff line change
@@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "bzflag";
version = "2.4.14";
version = "2.4.16";

src = fetchurl {
url = "https://download.bzflag.org/${pname}/source/${version}/${name}.tar.bz2";
sha256 = "1p4vaap8msk7cfqkcc2nrchw7pp4inbyx706zmlwnmpr9k0nx909";
sha256 = "00y2ifjgl4yz1pb2fgkg00vrfb6yk5cfxwjbx3fw2alnsaw6cqgg";
};

nativeBuildInputs = [ pkgconfig ];
6 changes: 3 additions & 3 deletions pkgs/misc/emulators/wine/sources.nix
Original file line number Diff line number Diff line change
@@ -39,16 +39,16 @@ in rec {

unstable = fetchurl rec {
# NOTE: Don't forget to change the SHA256 for staging as well.
version = "3.14";
version = "3.17";
url = "https://dl.winehq.org/wine/source/3.x/wine-${version}.tar.xz";
sha256 = "01dhn3a6k3dwnrbz4bxvszhh5sxwy6s89y459g805hjmq8s6d2a7";
sha256 = "08fcziadw40153a9rv630m7iz6ipfzylms5y191z4sj2vvhy5vac";
inherit (stable) mono gecko32 gecko64;
};

staging = fetchFromGitHub rec {
# https://github.com/wine-compholio/wine-staging/releases
inherit (unstable) version;
sha256 = "0h6gck0p92hin0m13q1hnlfnqs4vy474w66ppinvqms2zn3vibgi";
sha256 = "1ds9q90xjg59ikic98kqkhmijnqx4yplvwsm6rav4mx72yci7d4w";
owner = "wine-staging";
repo = "wine-staging";
rev = "v${version}";
4 changes: 2 additions & 2 deletions pkgs/misc/themes/tetra/default.nix
Original file line number Diff line number Diff line change
@@ -2,13 +2,13 @@

stdenv.mkDerivation rec {
name = "tetra-gtk-theme-${version}";
version = "0.1.6";
version = "0.2.0";

src = fetchFromGitHub {
owner = "hrdwrrsk";
repo = "tetra-gtk-theme";
rev = version;
sha256 = "0jdgj7ac9842cgrjnzdqlf1f3hlf9v7xk377pvqcz2lwcr1dfaxz";
sha256 = "1lzkmswv3ml2zj80z067j1hj1cvpdcl86jllahqx3jwnmr0a4fhd";
};

preBuild = ''
8 changes: 4 additions & 4 deletions pkgs/os-specific/linux/iwd/default.nix
Original file line number Diff line number Diff line change
@@ -3,17 +3,17 @@
let
ell = fetchgit {
url = https://git.kernel.org/pub/scm/libs/ell/ell.git;
rev = "0.10";
sha256 = "1yzbx4l3a6hbdmirgbvnrjfiwflyzd38mbxnp23gn9hg3ni3br34";
rev = "0.11";
sha256 = "0nifa5w6fxy7cagyas2a0zhcppi83yrcsnnp70ls2rc90x4r1ip8";
};
in stdenv.mkDerivation rec {
name = "iwd-${version}";
version = "0.8";
version = "0.9";

src = fetchgit {
url = https://git.kernel.org/pub/scm/network/wireless/iwd.git;
rev = version;
sha256 = "0bx31f77mz3rbl3xja48lb5zgwgialg7hvax889kpkz92wg26mgv";
sha256 = "1l1jbwsshjbz32s4rf0zfcn3fd16si4y9qa0zaxp00bfzflnpcd4";
};

nativeBuildInputs = [
29 changes: 14 additions & 15 deletions pkgs/servers/emby/default.nix
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{ stdenv, fetchurl, unzip, sqlite, makeWrapper, mono54, ffmpeg }:
{ stdenv, fetchurl, unzip, sqlite, makeWrapper, dotnet-sdk, ffmpeg }:

stdenv.mkDerivation rec {
name = "emby-${version}";
version = "3.5.2.0";
version = "3.5.3.0";

# We are fetching a binary here, however, a source build is possible.
# See -> https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=emby-server-git#n43
@@ -11,8 +11,8 @@ stdenv.mkDerivation rec {
# This may also need msbuild (instead of xbuild) which isn't in nixpkgs
# See -> https://github.com/NixOS/nixpkgs/issues/29817
src = fetchurl {
url = "https://github.com/MediaBrowser/Emby.Releases/releases/download/${version}/embyserver-mono_${version}.zip";
sha256 = "12f9skvnr9qxnrvr3q014yggfwvkpjk0ynbgf0fwk56h4kal7fx8";
url = "https://github.com/MediaBrowser/Emby.Releases/releases/download/${version}/embyserver-netcore_${version}.zip";
sha256 = "0311af3q813cx0ykbdk9vkmnyqi2l8rx66jnvdkw927q6invnnpj";
};

buildInputs = [
@@ -21,26 +21,25 @@ stdenv.mkDerivation rec {
];

propagatedBuildInputs = [
mono54
dotnet-sdk
sqlite
];

preferLocalBuild = true;

# Need to set sourceRoot as unpacker will complain about multiple directory output
sourceRoot = ".";

buildPhase = ''
substituteInPlace SQLitePCLRaw.provider.sqlite3.dll.config --replace libsqlite3.so ${sqlite.out}/lib/libsqlite3.so
substituteInPlace MediaBrowser.Server.Mono.exe.config --replace ProgramData-Server "/var/lib/emby/ProgramData-Server"
rm -rf {electron,runtimes}
'';

installPhase = ''
mkdir -p "$out/bin"
cp -r * "$out/bin"
makeWrapper "${mono54}/bin/mono" $out/bin/MediaBrowser.Server.Mono \
--add-flags "$out/bin/MediaBrowser.Server.Mono.exe -ffmpeg ${ffmpeg}/bin/ffmpeg -ffprobe ${ffmpeg}/bin/ffprobe"
install -dm 755 "$out/opt/emby-server"
cp -r * "$out/opt/emby-server"
makeWrapper "${dotnet-sdk}/bin/dotnet" $out/bin/emby \
--prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [
sqlite
]}" \
--add-flags "$out/opt/emby-server/EmbyServer.dll -programdata /var/lib/emby/ProgramData-Server -ffmpeg ${ffmpeg}/bin/ffmpeg -ffprobe ${ffmpeg}/bin/ffprobe"
'';

meta = with stdenv.lib; {
4 changes: 2 additions & 2 deletions pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix
Original file line number Diff line number Diff line change
@@ -2,13 +2,13 @@

stdenv.mkDerivation rec {
name = "check_ssl_cert-${version}";
version = "1.72.0";
version = "1.73.0";

src = fetchFromGitHub {
owner = "matteocorti";
repo = "check_ssl_cert";
rev = "v${version}";
sha256 = "1125yffw0asxa3blcgg6gr8nvwc5jhxbqi0wak5w06svw8ka9wpr";
sha256 = "0ymaypsv1s5pmk8fg9d67khcjy5h7vjbg6hd1fgslp92qcw90dqa";
};

nativeBuildInputs = [ makeWrapper ];
4 changes: 2 additions & 2 deletions pkgs/servers/nosql/arangodb/default.nix
Original file line number Diff line number Diff line change
@@ -3,14 +3,14 @@

let
in stdenv.mkDerivation rec {
version = "3.3.15";
version = "3.3.16";
name = "arangodb-${version}";

src = fetchFromGitHub {
repo = "arangodb";
owner = "arangodb";
rev = "v${version}";
sha256 = "177n2l8k8fswxvz102n6lm0qsn0fvq0s2zx6skrfg4g7gil3wkyb";
sha256 = "0pw930ri5a0f1s6mhsbjc58lsmpy535f5wv2vcp8mzdx1rk3l091";
};

buildInputs = [
4 changes: 4 additions & 0 deletions pkgs/shells/elvish/default.nix
Original file line number Diff line number Diff line change
@@ -6,6 +6,10 @@ buildGoPackage rec {

goPackagePath = "github.com/elves/elvish";
excludedPackages = [ "website" ];
buildFlagsArray = ''
-ldflags=
-X ${goPackagePath}/buildinfo.Version=${version}
'';

src = fetchFromGitHub {
repo = "elvish";
4 changes: 2 additions & 2 deletions pkgs/tools/networking/babeld/default.nix
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{ stdenv, fetchurl }:

stdenv.mkDerivation rec {
name = "babeld-1.8.2";
name = "babeld-1.8.3";

src = fetchurl {
url = "http://www.pps.univ-paris-diderot.fr/~jch/software/files/${name}.tar.gz";
sha256 = "1p751zb7h75f8w7jz37432dj610f432jnj37lxhmav9q6aqyrv87";
sha256 = "1gb6fcvi1cyl05sr9zhhasqlcbi927sbc2dns1jbnyz029lcb31n";
};

preBuild = ''
4 changes: 2 additions & 2 deletions pkgs/tools/system/bfs/default.nix
Original file line number Diff line number Diff line change
@@ -2,13 +2,13 @@

stdenv.mkDerivation rec {
name = "bfs-${version}";
version = "1.2.3";
version = "1.2.4";

src = fetchFromGitHub {
repo = "bfs";
owner = "tavianator";
rev = version;
sha256 = "01vcqanj2sifa5i51wvrkxh55d6hrq6iq7zmnhv4ls221dqmbyyn";
sha256 = "0nxx2njjp04ik6msfmf07hprw0j88wg04m0q1sf17mhkliw2d78s";
};

postPatch = ''
1 change: 1 addition & 0 deletions pkgs/top-level/all-packages.nix
Original file line number Diff line number Diff line change
@@ -22162,6 +22162,7 @@ with pkgs;
terraform_0_10-full
terraform_0_11
terraform_0_11-full
terraform_plugins_test
;

terraform = terraform_0_11;