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: 68b7de9e2e26
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: da7990eb5a8d
Choose a head ref

Commits on Sep 10, 2018

  1. pythonPackages.us: fix build

    Required jellyfish==0.5.6 but we have 0.6.1. Loosen requirements.
    xeji committed Sep 10, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    a7166cd View commit details
  2. pythonPackages.readme_renderer: fix build

    Disable one test case that has failed since last bleach update.
    xeji committed Sep 10, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    travi Matt Travi
    Copy the full SHA
    bb1f342 View commit details
  3. pythonPackages.pyfakefs: 3.4.1 -> 3.4.3, fix build

    Update and disable some failing test cases
    xeji committed Sep 10, 2018
    Copy the full SHA
    d2a885a View commit details
  4. pythonPackages.pydub: fix build and tests

    - remove obsolete patch that caused build failure
    - no tests were run because required data files were missing in pypi
      version; use github version instead
    xeji committed Sep 10, 2018
    Copy the full SHA
    80ecef8 View commit details
  5. Copy the full SHA
    40c469e View commit details
  6. pythonPackages.pydub: fix aarch64 build

    one test failed due to rounding errors, disable it
    xeji committed Sep 10, 2018
    Copy the full SHA
    bc03639 View commit details
  7. pythonPackages.pyfakefs: fix darwin build

    One test failed on darwin due to case-insensitive file system,
    disable it.
    xeji committed Sep 10, 2018
    Copy the full SHA
    bd02a19 View commit details

Commits on Sep 12, 2018

  1. kubernetes: 1.10.5 -> 1.11.3

    Fixed minor issue where kube-addon manager complaints about
    /opt/namespace.yaml missing.
    
    Added release notes with reference to Kubernetes 1.11 release notes.
    
    closes #43882
    Johan Thomsen committed Sep 12, 2018
    Copy the full SHA
    a49f56c View commit details

Commits on Sep 13, 2018

  1. Copy the full SHA
    56b9f6f View commit details
  2. libiio: init at 0.15

    Signed-off-by: Austin Seipp <aseipp@pobox.com>
    thoughtpolice committed Sep 13, 2018
    Copy the full SHA
    0f2b10d View commit details
  3. Copy the full SHA
    049b3a6 View commit details
  4. Copy the full SHA
    bef541c View commit details
  5. Copy the full SHA
    595ae18 View commit details
  6. vmTools: update debian repositories to stable Release.xz urls

    Previously the Release.xz URL would show up with a new hash whenever
    debian releases an update. By using archive.org we should have a stable
    source for those. I wasn't able to find the equivalent in the debian
    world. Maybe they don't keep all the different Release files around..
    andir committed Sep 13, 2018
    Copy the full SHA
    87462d6 View commit details
  7. pythonPackages.restview: fix tests

    Failed after readme_renderer was updated. Apply an upstream patch.
    xeji committed Sep 13, 2018
    Copy the full SHA
    6dc5713 View commit details
  8. Copy the full SHA
    66e6ee7 View commit details
  9. Merge pull request #46573 from johanot/kubernetes-1.10-1.11

    kubernetes: 1.10.5 -> 1.11.3
    srhb authored Sep 13, 2018
    Copy the full SHA
    d024f91 View commit details
  10. Merge pull request #46488 from xeji/p/python-fixes

    pythonPackages.{pydub,readme_renderer,pyfakefs,us,restview}: fix build
    xeji authored Sep 13, 2018
    Copy the full SHA
    2bc08ce View commit details
  11. leo-editor: 5.6 -> 5.7.3, fix build (#46589)

    Previous version depended on qt56.qtwebengine which was broken.
    xeji authored Sep 13, 2018
    Copy the full SHA
    eb88142 View commit details
  12. bat: 0.6.1 -> 0.7.0

    dywedir committed Sep 13, 2018
    Copy the full SHA
    af5cea5 View commit details
  13. Merge pull request #46601 from dywedir/bat

    bat: 0.6.1 -> 0.7.0
    Mic92 authored Sep 13, 2018
    Copy the full SHA
    75177ab View commit details
  14. Merge pull request #46600 from mcmtroffaes/feature/wolfssl-tls13

    wolfssl: enable all features
    Mic92 authored Sep 13, 2018
    Copy the full SHA
    da7990e View commit details
8 changes: 8 additions & 0 deletions nixos/doc/manual/release-notes/rl-1809.xml
Original file line number Diff line number Diff line change
@@ -451,6 +451,14 @@ inherit (pkgs.nixos {
deprecated. Use <literal>networking.networkmanager.dns</literal> instead.
</para>
</listitem>
<listitem>
<para>
The Kubernetes package has been bumped to major version 1.11.
Please consult the
<link xlink:href="https://github.com/kubernetes/kubernetes/blob/release-1.11/CHANGELOG-1.11.md">release notes</link>
for details on new features and api changes.
</para>
</listitem>
<listitem>
<para>
The option
18 changes: 17 additions & 1 deletion nixos/modules/services/monitoring/datadog-agent.nix
Original file line number Diff line number Diff line change
@@ -8,14 +8,14 @@ let
ddConf = {
dd_url = "https://app.datadoghq.com";
skip_ssl_validation = "no";
api_key = "";
confd_path = "/etc/datadog-agent/conf.d";
additional_checksd = "/etc/datadog-agent/checks.d";
use_dogstatsd = true;
}
// optionalAttrs (cfg.logLevel != null) { log_level = cfg.logLevel; }
// optionalAttrs (cfg.hostname != null) { inherit (cfg) hostname; }
// optionalAttrs (cfg.tags != null ) { tags = concatStringsSep ", " cfg.tags; }
// optionalAttrs (cfg.enableLiveProcessCollection) { process_config = { enabled = "true"; }; }
// cfg.extraConfig;

# Generate Datadog configuration files for each configured checks.
@@ -125,6 +125,13 @@ in {
'';
};

enableLiveProcessCollection = mkOption {
description = ''
Whether to enable the live process collection agent.
'';
default = false;
type = types.bool;
};
checks = mkOption {
description = ''
Configuration for all Datadog checks. Keys of this attribute
@@ -229,6 +236,15 @@ in {
path = [ datadogPkg pkgs.python pkgs.sysstat pkgs.procps pkgs.jdk ];
serviceConfig.ExecStart = "${datadogPkg}/bin/dd-jmxfetch";
});

datadog-process-agent = lib.mkIf cfg.enableLiveProcessCollection (makeService {
description = "Datadog Live Process Agent";
path = [ ];
script = ''
export DD_API_KEY=$(head -n 1 ${cfg.apiKeyFile})
${pkgs.datadog-process-agent}/bin/agent --config /etc/datadog-agent/datadog.yaml
'';
});
};

environment.etc = etcfiles;
20 changes: 0 additions & 20 deletions pkgs/applications/audio/milkytracker/decompressor_gzip.patch

This file was deleted.

27 changes: 12 additions & 15 deletions pkgs/applications/audio/milkytracker/default.nix
Original file line number Diff line number Diff line change
@@ -1,29 +1,26 @@
{ stdenv, fetchurl, SDL2, alsaLib, cmake, libjack2, perl
, zlib, zziplib, pkgconfig, makeWrapper
}:
{ stdenv, fetchFromGitHub, cmake, pkgconfig, makeWrapper
, SDL2, alsaLib, libjack2, lhasa, perl, rtmidi, zlib, zziplib }:

stdenv.mkDerivation rec {
version = "1.01";
version = "1.02.00";
name = "milkytracker-${version}";

src = fetchurl {
url = "https://github.com/milkytracker/MilkyTracker/archive/v${version}.00.tar.gz";
sha256 = "1dvnddsnn9c83lz4dlm0cfjpc0m524amfkbalxbswdy0qc8cj1wv";
src = fetchFromGitHub {
owner = "milkytracker";
repo = "MilkyTracker";
rev = "v${version}";
sha256 = "05a6d7l98k9i82dwrgi855dnccm3f2lkb144gi244vhk1156n0ca";
};

preBuild=''
export CPATH=${zlib.out}/lib
'';

nativeBuildInputs = [ cmake pkgconfig makeWrapper ];

buildInputs = [ SDL2 alsaLib libjack2 perl zlib zziplib ];
buildInputs = [ SDL2 alsaLib libjack2 lhasa perl rtmidi zlib zziplib ];

meta = {
meta = with stdenv.lib; {
description = "Music tracker application, similar to Fasttracker II";
homepage = http://milkytracker.org;
license = stdenv.lib.licenses.gpl3Plus;
license = licenses.gpl3Plus;
platforms = [ "x86_64-linux" "i686-linux" ];
maintainers = [ stdenv.lib.maintainers.zoomulator ];
maintainers = with maintainers; [ zoomulator ];
};
}
17 changes: 4 additions & 13 deletions pkgs/applications/editors/leo-editor/default.nix
Original file line number Diff line number Diff line change
@@ -1,29 +1,20 @@
{ stdenv, python3, libsForQt56, fetchFromGitHub, makeWrapper, makeDesktopItem }:
{ stdenv, python3, fetchFromGitHub, makeWrapper, makeDesktopItem }:

let
packageOverrides = self: super: {
pyqt56 = libsForQt56.callPackage ../../../development/python-modules/pyqt/5.x.nix {
pythonPackages = self;
};
};

pythonPackages = (python3.override { inherit packageOverrides; }).pkgs;
in
stdenv.mkDerivation rec {
name = "leo-editor-${version}";
version = "5.6";
version = "5.7.3";

src = fetchFromGitHub {
owner = "leo-editor";
repo = "leo-editor";
rev = version;
sha256 = "1k6q3gvaf05bi0mzkmmb1p6wrgxwri7ivn38p6f0m0wfd3f70x2j";
sha256 = "0ri6l6cxwva450l05af5vs1lsgrz6ciwd02njdgphs9pm1vwxbl9";
};

dontBuild = true;

nativeBuildInputs = [ makeWrapper python3 ];
propagatedBuildInputs = with pythonPackages; [ pyqt56 docutils ];
propagatedBuildInputs = with python3.pkgs; [ pyqt5 docutils ];

desktopItem = makeDesktopItem rec {
name = "leo-editor";
16 changes: 9 additions & 7 deletions pkgs/applications/networking/cluster/kubernetes/default.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, lib, fetchFromGitHub, removeReferencesTo, which, go_1_9, go-bindata, makeWrapper, rsync
{ stdenv, lib, fetchFromGitHub, removeReferencesTo, which, go_1_10, go-bindata, makeWrapper, rsync
, components ? [
"cmd/kubeadm"
"cmd/kubectl"
@@ -15,17 +15,16 @@ with lib;

stdenv.mkDerivation rec {
name = "kubernetes-${version}";
version = "1.10.5";
version = "1.11.3";

src = fetchFromGitHub {
owner = "kubernetes";
repo = "kubernetes";
rev = "v${version}";
sha256 = "1k6ayb43l68l0qw31cc4k1pwvm8aks3l2xm0gdxdxbbww1mnzix2";
sha256 = "1gwb5gs9l0adv3qc70wf8dwvbjh1mmgd3hh1jkwsbbnach28dvzb";
};

# Build using golang v1.9 in accordance with https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG-1.10.md#external-dependencies
buildInputs = [ removeReferencesTo makeWrapper which go_1_9 rsync go-bindata ];
buildInputs = [ removeReferencesTo makeWrapper which go_1_10 rsync go-bindata ];

outputs = ["out" "man" "pause"];

@@ -39,7 +38,7 @@ stdenv.mkDerivation rec {
patchShebangs ./hack
'';

WHAT="--use_go_build ${concatStringsSep " " components}";
WHAT="${concatStringsSep " " components}";

postBuild = ''
./hack/generate-docs.sh
@@ -53,16 +52,19 @@ stdenv.mkDerivation rec {
cp build/pause/pause "$pause/bin/pause"
cp -R docs/man/man1 "$man/share/man"
cp cluster/addons/addon-manager/namespace.yaml $out/share
cp cluster/addons/addon-manager/kube-addons.sh $out/bin/kube-addons
patchShebangs $out/bin/kube-addons
substituteInPlace $out/bin/kube-addons \
--replace /opt/namespace.yaml $out/share/namespace.yaml
wrapProgram $out/bin/kube-addons --set "KUBECTL_BIN" "$out/bin/kubectl"
$out/bin/kubectl completion bash > $out/share/bash-completion/completions/kubectl
$out/bin/kubectl completion zsh > $out/share/zsh/site-functions/_kubectl
'';

preFixup = ''
find $out/bin $pause/bin -type f -exec remove-references-to -t ${go_1_9} '{}' +
find $out/bin $pause/bin -type f -exec remove-references-to -t ${go_1_10} '{}' +
'';

meta = {
8 changes: 4 additions & 4 deletions pkgs/build-support/vm/default.nix
Original file line number Diff line number Diff line change
@@ -990,8 +990,8 @@ rec {
name = "debian-9.4-stretch-i386";
fullName = "Debian 9.4 Stretch (i386)";
packagesList = fetchurl {
url = mirror://debian/dists/stretch/main/binary-i386/Packages.xz;
sha256 = "05z5ccg4ysbrgallhai53sh83i0364w7a3fdq84dpv1li059jf10";
url = https://web.archive.org/web/20180912163509/http://ftp.debian.org/debian/dists/stretch/main/binary-i386/Packages.xz;
sha256 = "0flvn8zn7vk04p10ndf3aq0mdr8k2ic01g51aq4lsllkv8lmwzyh";
};
urlPrefix = mirror://debian;
packages = commonDebianPackages;
@@ -1001,8 +1001,8 @@ rec {
name = "debian-9.4-stretch-amd64";
fullName = "Debian 9.4 Stretch (amd64)";
packagesList = fetchurl {
url = mirror://debian/dists/stretch/main/binary-amd64/Packages.xz;
sha256 = "19j0c54b1b9lbk9fv2c2aswdh0s2c3klf97zrlmsz4hs8wm9jylq";
url = https://web.archive.org/web/20180912163152/http://ftp.debian.org/debian/dists/stretch/main/binary-amd64/Packages.xz;
sha256 = "11vnn9bba2jabixvabfbw9zparl326c88xn99di7pbr5xsnl15jm";
};
urlPrefix = mirror://debian;
packages = commonDebianPackages;
29 changes: 29 additions & 0 deletions pkgs/development/libraries/libiio/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
{ stdenv, fetchFromGitHub
, cmake, flex, bison
, libxml2
}:

stdenv.mkDerivation rec {
name = "libiio-${version}";
version = "0.15";

src = fetchFromGitHub {
owner = "analogdevicesinc";
repo = "libiio";
rev = "refs/tags/v${version}";
sha256 = "05sbvvjka03qi080ad6g2y6gfwqp3n3zv7dpv237dym0zjyxqfa7";
};

outputs = [ "out" "lib" "dev" ];

nativeBuildInputs = [ cmake flex bison ];
buildInputs = [ libxml2 ];

meta = with stdenv.lib; {
description = "API for interfacing with the Linux Industrial I/O Subsystem";
homepage = https://github.com/analogdevicesinc/libiio;
license = licenses.lgpl21;
platforms = platforms.linux;
maintainers = with maintainers; [ thoughtpolice ];
};
}
2 changes: 2 additions & 0 deletions pkgs/development/libraries/wolfssl/default.nix
Original file line number Diff line number Diff line change
@@ -11,6 +11,8 @@ stdenv.mkDerivation rec {
sha256 = "00mpq1z8j37a873dbk9knb835m3qlwqnd1rslirqkc44hpz1i64j";
};

configureFlags = [ "--enable-all" ];

outputs = [ "out" "dev" "doc" "lib" ];

nativeBuildInputs = [ autoreconfHook ];
24 changes: 17 additions & 7 deletions pkgs/development/python-modules/pydub/default.nix
Original file line number Diff line number Diff line change
@@ -1,19 +1,29 @@
{ stdenv, buildPythonPackage, fetchPypi, scipy, ffmpeg-full }:
{ stdenv, buildPythonPackage, fetchFromGitHub, scipy, ffmpeg-full }:

buildPythonPackage rec {
pname = "pydub";
version = "0.22.1";
src = fetchPypi {
inherit pname version;
sha256 = "20beff39e9959a3b2cb4392802aecb9b2417837fff635d2b00b5ef5f5326d313";
# pypi version doesn't include required data files for tests
src = fetchFromGitHub {
owner = "jiaaro";
repo = pname;
rev = "v${version}";
sha256 = "0xqyvzgdfy01p98wnvsrf6iwdfq91ad377r6j12r8svm13ygx5bv";
};

patches = [
./pyaudioop-python3.patch
];

# disable a test that fails on aarch64 due to rounding errors
postPatch = stdenv.lib.optionalString stdenv.isAarch64 ''
substituteInPlace test/test.py \
--replace "test_overlay_with_gain_change" "notest_overlay_with_gain_change"
'';

checkInputs = [ scipy ffmpeg-full ];

checkPhase = ''
python test/test.py
'';

meta = with stdenv.lib; {
description = "Manipulate audio with a simple and easy high level interface.";
homepage = "http://pydub.com/";
46 changes: 0 additions & 46 deletions pkgs/development/python-modules/pydub/pyaudioop-python3.patch

This file was deleted.

Loading