NixOS · Mar 11, 2019 · Mar 12, 2019 · Mar 22, 2019 · Mar 22, 2019 · Mar 22, 2019
diff --git a/nixos/doc/manual/release-notes/rl-1909.xml b/nixos/doc/manual/release-notes/rl-1909.xml
@@ -42,6 +42,29 @@
   </itemizedlist>
  </section>
 
+ <section xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         version="5.0"
+         xml:id="sec-release-19.09-incompatibilities">
+  <title>Backward Incompatibilities</title>
+
+  <para>
+   When upgrading from a previous release, please be aware of the following
+   incompatible changes:
+  </para>
+
+  <itemizedlist>
+   <listitem>
+    <para>
+     Buildbot no longer supports Python 2, as support was dropped upstream in
+     version 2.0.0. Configurations may need to be modified to make them
+     compatible with Python 3.
+    </para>
+   </listitem>
+  </itemizedlist>
+ </section>
+
  <section xmlns="http://docbook.org/ns/docbook"
          xmlns:xlink="http://www.w3.org/1999/xlink"
          xmlns:xi="http://www.w3.org/2001/XInclude"

diff --git a/nixos/modules/services/continuous-integration/buildbot/master.nix b/nixos/modules/services/continuous-integration/buildbot/master.nix
@@ -199,10 +199,10 @@ in {
 
       package = mkOption {
         type = types.package;
-        default = pkgs.pythonPackages.buildbot-full;
-        defaultText = "pkgs.pythonPackages.buildbot-full";
+        default = pkgs.python3Packages.buildbot-full;
+        defaultText = "pkgs.python3Packages.buildbot-full";
         description = "Package to use for buildbot.";
-        example = literalExample "pkgs.python3Packages.buildbot-full";
+        example = literalExample "pkgs.python3Packages.buildbot";
       };
 
       packages = mkOption {

diff --git a/nixos/modules/services/continuous-integration/buildbot/worker.nix b/nixos/modules/services/continuous-integration/buildbot/worker.nix
@@ -118,10 +118,10 @@ in {
 
       package = mkOption {
         type = types.package;
-        default = pkgs.pythonPackages.buildbot-worker;
-        defaultText = "pkgs.pythonPackages.buildbot-worker";
+        default = pkgs.python3Packages.buildbot-worker;
+        defaultText = "pkgs.python3Packages.buildbot-worker";
         description = "Package to use for buildbot worker.";
-        example = literalExample "pkgs.python3Packages.buildbot-worker";
+        example = literalExample "pkgs.python2Packages.buildbot-worker";
       };
 
       packages = mkOption {

diff --git a/nixos/modules/services/x11/window-managers/dwm.nix b/nixos/modules/services/x11/window-managers/dwm.nix
@@ -25,7 +25,7 @@ in
       { name = "dwm";
         start =
           ''
-            ${pkgs.dwm}/bin/dwm &
+            dwm &
             waitPID=$!
           '';
       };

diff --git a/nixos/tests/buildbot.nix b/nixos/tests/buildbot.nix
@@ -5,116 +5,109 @@
 
 with import ../lib/testing.nix { inherit system pkgs; };
 
-let
-  # Test ensures buildbot master comes up correctly and workers can connect
-  mkBuildbotTest = python: makeTest {
-    name = "buildbot";
-
-    nodes = {
-      bbmaster = { pkgs, ... }: {
-        services.buildbot-master = {
-          enable = true;
-          package = python.pkgs.buildbot-full;
-
-          # NOTE: use fake repo due to no internet in hydra ci
-          factorySteps = [
-            "steps.Git(repourl='git://gitrepo/fakerepo.git', mode='incremental')"
-            "steps.ShellCommand(command=['bash', 'fakerepo.sh'])"
-          ];
-          changeSource = [
-            "changes.GitPoller('git://gitrepo/fakerepo.git', workdir='gitpoller-workdir', branch='master', pollinterval=300)"
-          ];
-        };
-        networking.firewall.allowedTCPPorts = [ 8010 8011 9989 ];
-        environment.systemPackages = with pkgs; [ git python.pkgs.buildbot-full ];
-      };
-
-      bbworker = { pkgs, ... }: {
-        services.buildbot-worker = {
-          enable = true;
-          masterUrl = "bbmaster:9989";
-        };
-        environment.systemPackages = with pkgs; [ git python.pkgs.buildbot-worker ];
+# Test ensures buildbot master comes up correctly and workers can connect
+makeTest {
+  name = "buildbot";
+
+  nodes = {
+    bbmaster = { pkgs, ... }: {
+      services.buildbot-master = {
+        enable = true;
+
+        # NOTE: use fake repo due to no internet in hydra ci
+        factorySteps = [
+          "steps.Git(repourl='git://gitrepo/fakerepo.git', mode='incremental')"
+          "steps.ShellCommand(command=['bash', 'fakerepo.sh'])"
+        ];
+        changeSource = [
+          "changes.GitPoller('git://gitrepo/fakerepo.git', workdir='gitpoller-workdir', branch='master', pollinterval=300)"
+        ];
       };
+      networking.firewall.allowedTCPPorts = [ 8010 8011 9989 ];
+      environment.systemPackages = with pkgs; [ git python3Packages.buildbot-full ];
+    };
 
-      gitrepo = { pkgs, ... }: {
-        services.openssh.enable = true;
-        networking.firewall.allowedTCPPorts = [ 22 9418 ];
-        environment.systemPackages = with pkgs; [ git ];
+    bbworker = { pkgs, ... }: {
+      services.buildbot-worker = {
+        enable = true;
+        masterUrl = "bbmaster:9989";
       };
+      environment.systemPackages = with pkgs; [ git python3Packages.buildbot-worker ];
     };
 
-    testScript = ''
-      #Start up and populate fake repo
-      $gitrepo->waitForUnit("multi-user.target");
-      print($gitrepo->execute(" \
-        git config --global user.name 'Nobody Fakeuser' && \
-        git config --global user.email 'nobody\@fakerepo.com' && \
-        rm -rvf /srv/repos/fakerepo.git /tmp/fakerepo && \
-        mkdir -pv /srv/repos/fakerepo ~/.ssh && \
-        ssh-keyscan -H gitrepo > ~/.ssh/known_hosts && \
-        cat ~/.ssh/known_hosts && \
-        cd /srv/repos/fakerepo && \
-        git init && \
-        echo -e '#!/bin/sh\necho fakerepo' > fakerepo.sh && \
-        cat fakerepo.sh && \
-        touch .git/git-daemon-export-ok && \
-        git add fakerepo.sh .git/git-daemon-export-ok && \
-        git commit -m fakerepo && \
-        git daemon --verbose --export-all --base-path=/srv/repos --reuseaddr & \
-      "));
-
-      # Test gitrepo
-      $bbmaster->waitForUnit("network-online.target");
-      #$bbmaster->execute("nc -z gitrepo 9418");
-      print($bbmaster->execute(" \
-        rm -rfv /tmp/fakerepo && \
-        git clone git://gitrepo/fakerepo /tmp/fakerepo && \
-        pwd && \
-        ls -la && \
-        ls -la /tmp/fakerepo \
-      "));
-
-      # Test start master and connect worker
-      $bbmaster->waitForUnit("buildbot-master.service");
-      $bbmaster->waitUntilSucceeds("curl -s --head http://bbmaster:8010") =~ /200 OK/;
-      $bbworker->waitForUnit("network-online.target");
-      $bbworker->execute("nc -z bbmaster 8010");
-      $bbworker->execute("nc -z bbmaster 9989");
-      $bbworker->waitForUnit("buildbot-worker.service");
-      print($bbworker->execute("ls -la /home/bbworker/worker"));
-
-
-      # Test stop buildbot master and worker
-      print($bbmaster->execute(" \
-        systemctl -l --no-pager status buildbot-master && \
-        systemctl stop buildbot-master \
-      "));
-      $bbworker->fail("nc -z bbmaster 8010");
-      $bbworker->fail("nc -z bbmaster 9989");
-      print($bbworker->execute(" \
-        systemctl -l --no-pager status buildbot-worker && \
-        systemctl stop buildbot-worker && \
-        ls -la /home/bbworker/worker \
-      "));
-
-
-      # Test buildbot daemon mode
-      $bbmaster->execute("buildbot create-master /tmp");
-      $bbmaster->execute("mv -fv /tmp/master.cfg.sample /tmp/master.cfg");
-      $bbmaster->execute("sed -i 's/8010/8011/' /tmp/master.cfg");
-      $bbmaster->execute("buildbot start /tmp");
-      $bbworker->execute("nc -z bbmaster 8011");
-      $bbworker->waitUntilSucceeds("curl -s --head http://bbmaster:8011") =~ /200 OK/;
-      $bbmaster->execute("buildbot stop /tmp");
-      $bbworker->fail("nc -z bbmaster 8011");
-
-    '';
-
-    meta.maintainers = with pkgs.stdenv.lib.maintainers; [ nand0p ];
-
+    gitrepo = { pkgs, ... }: {
+      services.openssh.enable = true;
+      networking.firewall.allowedTCPPorts = [ 22 9418 ];
+      environment.systemPackages = with pkgs; [ git ];
+    };
   };
-in {
-  python2 = mkBuildbotTest pkgs.python2;
-  python3 = mkBuildbotTest pkgs.python3;
+
+  testScript = ''
+    #Start up and populate fake repo
+    $gitrepo->waitForUnit("multi-user.target");
+    print($gitrepo->execute(" \
+      git config --global user.name 'Nobody Fakeuser' && \
+      git config --global user.email 'nobody\@fakerepo.com' && \
+      rm -rvf /srv/repos/fakerepo.git /tmp/fakerepo && \
+      mkdir -pv /srv/repos/fakerepo ~/.ssh && \
+      ssh-keyscan -H gitrepo > ~/.ssh/known_hosts && \
+      cat ~/.ssh/known_hosts && \
+      cd /srv/repos/fakerepo && \
+      git init && \
+      echo -e '#!/bin/sh\necho fakerepo' > fakerepo.sh && \
+      cat fakerepo.sh && \
+      touch .git/git-daemon-export-ok && \
+      git add fakerepo.sh .git/git-daemon-export-ok && \
+      git commit -m fakerepo && \
+      git daemon --verbose --export-all --base-path=/srv/repos --reuseaddr & \
+    "));
+
+    # Test gitrepo
+    $bbmaster->waitForUnit("network-online.target");
+    #$bbmaster->execute("nc -z gitrepo 9418");
+    print($bbmaster->execute(" \
+      rm -rfv /tmp/fakerepo && \
+      git clone git://gitrepo/fakerepo /tmp/fakerepo && \
+      pwd && \
+      ls -la && \
+      ls -la /tmp/fakerepo \
+    "));
+
+    # Test start master and connect worker
+    $bbmaster->waitForUnit("buildbot-master.service");
+    $bbmaster->waitUntilSucceeds("curl -s --head http://bbmaster:8010") =~ /200 OK/;
+    $bbworker->waitForUnit("network-online.target");
+    $bbworker->execute("nc -z bbmaster 8010");
+    $bbworker->execute("nc -z bbmaster 9989");
+    $bbworker->waitForUnit("buildbot-worker.service");
+    print($bbworker->execute("ls -la /home/bbworker/worker"));
+
+
+    # Test stop buildbot master and worker
+    print($bbmaster->execute(" \
+      systemctl -l --no-pager status buildbot-master && \
+      systemctl stop buildbot-master \
+    "));
+    $bbworker->fail("nc -z bbmaster 8010");
+    $bbworker->fail("nc -z bbmaster 9989");
+    print($bbworker->execute(" \
+      systemctl -l --no-pager status buildbot-worker && \
+      systemctl stop buildbot-worker && \
+      ls -la /home/bbworker/worker \
+    "));
+
+
+    # Test buildbot daemon mode
+    $bbmaster->execute("buildbot create-master /tmp");
+    $bbmaster->execute("mv -fv /tmp/master.cfg.sample /tmp/master.cfg");
+    $bbmaster->execute("sed -i 's/8010/8011/' /tmp/master.cfg");
+    $bbmaster->execute("buildbot start /tmp");
+    $bbworker->execute("nc -z bbmaster 8011");
+    $bbworker->waitUntilSucceeds("curl -s --head http://bbmaster:8011") =~ /200 OK/;
+    $bbmaster->execute("buildbot stop /tmp");
+    $bbworker->fail("nc -z bbmaster 8011");
+
+  '';
+
+  meta.maintainers = with pkgs.stdenv.lib.maintainers; [ nand0p ];
 }
diff --git a/pkgs/applications/audio/paulstretch/default.nix b/pkgs/applications/audio/paulstretch/default.nix
@@ -0,0 +1,50 @@
+{ stdenv, fetchFromGitHub, audiofile, libvorbis, fltk, fftw, fftwFloat,
+minixml, pkgconfig, libmad, libjack2, portaudio, libsamplerate }:
+
+stdenv.mkDerivation {
+  pname = "paulstretch";
+  version = "2.2-2";
+
+  src = fetchFromGitHub {
+    owner = "paulnasca";
+    repo = "paulstretch_cpp";
+    rev = "7f5c3993abe420661ea0b808304b0e2b4b0048c5";
+    sha256 = "06dy03dbz1yznhsn0xvsnkpc5drzwrgxbxdx0hfpsjn2xcg0jrnc";
+  };
+
+  nativeBuildInputs = [ pkgconfig ];
+
+  buildInputs = [
+    audiofile
+    libvorbis
+    fltk
+    fftw
+    fftwFloat
+    minixml
+    libmad
+    libjack2
+    portaudio
+    libsamplerate
+  ];
+
+  buildPhase = ''
+    bash compile_linux_fftw_jack.sh
+  '';
+
+  installPhase = ''
+    install -Dm555 ./paulstretch $out/bin/paulstretch
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Produces high quality extreme sound stretching";
+    longDescription = ''
+      This is a program for stretching the audio. It is suitable only for
+      extreme sound stretching of the audio (like 50x) and for applying
+      special effects by "spectral smoothing" the sounds.
+      It can transform any sound/music to a texture.
+    '';
+    homepage = http://hypermammut.sourceforge.net/paulstretch/;
+    platforms = platforms.linux;
+    license = licenses.gpl2;
+  };
+}
diff --git a/pkgs/applications/networking/cluster/kompose/default.nix b/pkgs/applications/networking/cluster/kompose/default.nix
@@ -2,22 +2,22 @@
 
 buildGoPackage rec {
   name = "kompose-${version}";
-  version = "1.9.0";
+  version = "1.18.0";
 
   goPackagePath = "github.com/kubernetes/kompose";
 
   src = fetchFromGitHub {
     rev = "v${version}";
     owner = "kubernetes";
     repo = "kompose";
-    sha256 = "00yvih5gn67sw9v30a0rpaj1zag7k02i4biw1p37agxih0aphc86";
+    sha256 = "1hb4bs710n9fghphhfakwg42wjscf136dcr05zwwfg7iyqx2cipc";
   };
 
   meta = with stdenv.lib; {
     description = "A tool to help users who are familiar with docker-compose move to Kubernetes";
     homepage = https://github.com/kubernetes/kompose;
     license = licenses.asl20;
-    maintainers = with maintainers; [thpham];
+    maintainers = with maintainers; [ thpham vdemeester ];
     platforms = platforms.unix;
   };
 }
diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix
@@ -3,11 +3,11 @@
 let configFile = writeText "riot-config.json" conf; in
 stdenv.mkDerivation rec {
   name= "riot-web-${version}";
-  version = "1.0.3";
+  version = "1.0.5";
 
   src = fetchurl {
     url = "https://github.com/vector-im/riot-web/releases/download/v${version}/riot-v${version}.tar.gz";
-    sha256 = "1gwz47wi9g9g9zzf46ry3q9s855rvlcjlg3dsxr1xdvz4arci195";
+    sha256 = "0m0kdnw0pc84yasnybfh9hmkajji0wjk2snv89crdi79s8k572ki";
   };
 
   installPhase = ''