NixOS · May 8, 2019 · Aug 1, 2019 · Aug 3, 2019 · Aug 3, 2019 · Aug 4, 2019
diff --git a/doc/languages-frameworks/idris.section.md b/doc/languages-frameworks/idris.section.md
@@ -124,3 +124,21 @@ in another file (say `default.nix`) to be able to build it with
 ```
 $ nix-build -A yaml
 ```
+
+## Passing options to `idris` commands
+
+The `build-idris-package` function provides also optional input values to set additional options for the used `idris` commands.
+
+Specifically, you can set `idrisBuildOptions`, `idrisTestOptions`, `idrisInstallOptions` and `idrisDocOptions` to provide additional options to the `idris` command respectively when building, testing, installing and generating docs for your package.
+
+For example you could set
+
+```
+build-idris-package {
+  idrisBuildOptions = [ "--log" "1" "--verbose" ]
+
+  ...
+}
+```
+
+to require verbose output during `idris` build phase.
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
@@ -5599,6 +5599,11 @@
     github = "viric";
     name = "Lluís Batlle i Rossell";
   };
+  virusdave = {
+    email = "dave.nicponski@gmail.com";
+    github = "virusdave";
+    name = "Dave Nicponski";
+  };
   vizanto = {
     email = "danny@prime.vc";
     github = "vizanto";

diff --git a/nixos/lib/build-vms.nix b/nixos/lib/build-vms.nix
@@ -67,7 +67,7 @@ rec {
             in
             { key = "ip-address";
               config =
-                { networking.hostName = m.fst;
+                { networking.hostName = mkDefault m.fst;
 
                   networking.interfaces = listToAttrs interfaces;
 

diff --git a/nixos/modules/services/databases/postgresql.nix b/nixos/modules/services/databases/postgresql.nix
@@ -251,6 +251,10 @@ in
 
     environment.systemPackages = [ postgresql ];
 
+    environment.pathsToLink = [
+     "/share/postgresql"
+    ];
+
     systemd.services.postgresql =
       { description = "PostgreSQL Server";
 

diff --git a/nixos/modules/services/x11/desktop-managers/plasma5.nix b/nixos/modules/services/x11/desktop-managers/plasma5.nix
@@ -178,7 +178,7 @@ in
         ++ lib.optional (cfg.phononBackend == "vlc" && cfg.enableQt4Support) pkgs.phonon-backend-vlc
 
         # Optional hardware support features
-        ++ lib.optional config.hardware.bluetooth.enable bluedevil
+        ++ lib.optionals config.hardware.bluetooth.enable [ bluedevil bluez-qt ]
         ++ lib.optional config.networking.networkmanager.enable plasma-nm
         ++ lib.optional config.hardware.pulseaudio.enable plasma-pa
         ++ lib.optional config.powerManagement.enable powerdevil

diff --git a/nixos/tests/initdb.nix b/nixos/tests/initdb.nix
@@ -0,0 +1,26 @@
+let
+  pkgs = import <nixpkgs> { };
+in
+with import <nixpkgs/nixos/lib/testing.nix> { inherit pkgs; system = builtins.currentSystem; };
+with pkgs.lib;
+
+makeTest {
+    name = "pg-initdb";
+
+    machine = {...}:
+      {
+        documentation.enable = false;
+        services.postgresql.enable = true;
+        services.postgresql.package = pkgs.postgresql_9_6;
+        environment.pathsToLink = [
+          "/share/postgresql"
+        ];
+      };
+
+    testScript = ''
+      $machine->start;
+      $machine->succeed("sudo -u postgres initdb -D /tmp/testpostgres2");
+      $machine->shutdown;
+    '';
+
+  }
diff --git a/pkgs/applications/audio/mixxx/default.nix b/pkgs/applications/audio/mixxx/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, mkDerivation, fetchFromGitHub, makeWrapper, chromaprint
+{ stdenv, mkDerivation, fetchFromGitHub, chromaprint
 , fftw, flac, faad2, glibcLocales, mp4v2
 , libid3tag, libmad, libopus, libshout, libsndfile, libusb1, libvorbis
 , libGLU, libxcb, lilv, lv2, opusfile
@@ -17,8 +17,6 @@ mkDerivation rec {
     sha256 = "1q6c2wfpprsx7s7nz1w0mhm2yhikj54jxcv61kwylxx3n5k2na9r";
   };
 
-  nativeBuildInputs = [ makeWrapper ];
-
   buildInputs = [
     chromaprint fftw flac faad2 glibcLocales mp4v2 libid3tag libmad libopus libshout libsndfile
     libusb1 libvorbis libxcb libGLU lilv lv2 opusfile pkgconfig portaudio portmidi protobuf qtbase qtscript qtsvg
@@ -34,10 +32,9 @@ mkDerivation rec {
     "opus=1"
   ];
 
-  fixupPhase = ''
-    wrapProgram $out/bin/mixxx \
-      --set LOCALE_ARCHIVE ${glibcLocales}/lib/locale/locale-archive;
-  '';
+  qtWrapperArgs = [
+    "--set LOCALE_ARCHIVE ${glibcLocales}/lib/locale/locale-archive"
+  ];
 
   meta = with stdenv.lib; {
     homepage = https://mixxx.org;

diff --git a/pkgs/applications/audio/qtractor/default.nix b/pkgs/applications/audio/qtractor/default.nix
@@ -1,20 +1,21 @@
 { alsaLib, autoconf, automake, dssi, fetchurl, libjack2
 , ladspaH, ladspaPlugins, liblo, libmad, libsamplerate, libsndfile
 , libtool, libvorbis, lilv, lv2, pkgconfig, qttools, qtbase, rubberband, serd
-, sord, sratom, stdenv, suil }:
+, sord, sratom, stdenv, suil, wrapQtAppsHook }:
 
 stdenv.mkDerivation rec {
   pname = "qtractor";
-  version = "0.9.8";
+  version = "0.9.9";
 
   src = fetchurl {
     url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz";
-    sha256 = "1llajl450yh7bka32ngm4xdva6a2nnxzjc497ydh07rwkap16smx";
+    sha256 = "0qlbccdxyfy0f09y6qg1xkg12fm67bf2f2c27c22cg8lzk9ang5j";
   };
 
   nativeBuildInputs = [
-    autoconf automake libtool pkgconfig qttools
+    autoconf automake libtool pkgconfig qttools wrapQtAppsHook
   ];
+
   buildInputs =
     [ alsaLib dssi libjack2 ladspaH
       ladspaPlugins liblo libmad libsamplerate libsndfile libtool

diff --git a/pkgs/applications/audio/spotifyd/default.nix b/pkgs/applications/audio/spotifyd/default.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "1iybk9xrrvhrcl2xl5r2xhyn1ydhrgwnnb8ldhsw5c16b32z03q1";
   };
 
-  cargoSha256 = "0879p1h32259schmy8j3xnwpw3sw80f8mrj8s6b5aihi3yyzz521";
+  cargoSha256 = "1dzg4sb95ixjfhx6n4w2rgrq4481vw01nsdrbm746mz7nm71csk3";
 
   cargoBuildFlags = [
     "--no-default-features"

diff --git a/pkgs/applications/audio/vcv-rack/default.nix b/pkgs/applications/audio/vcv-rack/default.nix
@@ -5,13 +5,18 @@
 let
   glfw-git = glfw.overrideAttrs (oldAttrs: rec {
     name = "glfw-git-${version}";
-    version = "unstable-2018-05-29";
+    version = "2019-06-30";
     src = fetchFromGitHub {
-      owner = "glfw";
+      owner = "AndrewBelt";
       repo = "glfw";
-      rev = "0be4f3f75aebd9d24583ee86590a38e741db0904";
-      sha256 = "0zbcjgc7ks25yi949k0wjknfl00a4dqmz45mhp00k62vlq2sj0i5";
+      rev = "d9ab59efc781c392128a449361a381fcc93cf6f3";
+      sha256 = "1ykkq6qq8y6j5hlfj2zp1p87kr33vwhywziprz20v5avx1q7rjm8";
     };
+    # We patch the source to export a function that was added to the glfw fork
+    # for Rack so it is present when we build glfw as a shared library.
+    # See https://github.com/AndrewBelt/glfw/pull/1 for discussion of this issue
+    # with upstream.
+    patches = [ ./glfw.patch ];
     buildInputs = oldAttrs.buildInputs ++ [ libXext libXi ];
   });
   pfft-source = fetchFromBitbucket {
@@ -23,32 +28,31 @@ let
 in
 with stdenv.lib; stdenv.mkDerivation rec {
   name = "VCV-Rack-${version}";
-  version = "0.6.2b";
+  version = "1.1.3";
 
   src = fetchFromGitHub {
     owner = "VCVRack";
     repo = "Rack";
     rev = "v${version}";
-    sha256 = "17ynhxcci6dyn1yi871fd8yli4924fh12pmk510djwkcj5crhas6";
+    sha256 = "16q3x0jpwkdwwvh7rn472w7nfjf81s10z9c7bx011kk7rgk88hh2";
     fetchSubmodules = true;
   };
 
+  patches = [ ./rack-minimize-vendoring.patch ];
+
   prePatch = ''
-    ln -s ${pfft-source} dep/jpommier-pffft-source
+    cp -r ${pfft-source} dep/jpommier-pffft-source
 
     mkdir -p dep/include
 
     cp dep/jpommier-pffft-source/*.h dep/include
-    cp dep/nanosvg/src/*.h dep/include
+    cp dep/nanosvg/**/*.h dep/include
     cp dep/nanovg/src/*.h dep/include
     cp dep/osdialog/*.h dep/include
     cp dep/oui-blendish/*.h dep/include
 
     substituteInPlace include/audio.hpp --replace "<RtAudio.h>" "<rtaudio/RtAudio.h>"
     substituteInPlace compile.mk --replace "-march=nocona" ""
-    substituteInPlace Makefile \
-       --replace "-Wl,-Bstatic" "" \
-       --replace "-lglfw3" "-lglfw"
   '';
 
   enableParallelBuilding = true;
@@ -60,13 +64,12 @@ with stdenv.lib; stdenv.mkDerivation rec {
 
   installPhase = ''
     install -D -m755 -t $out/bin Rack
-    cp -r res $out/
 
-    mkdir -p $out/share/rack
-    cp LICENSE.txt LICENSE-dist.txt $out/share/rack
+    mkdir -p $out/share/vcv-rack
+    cp -r res Core.json template.vcv LICENSE* cacert.pem $out/share/vcv-rack
 
     # Override the default global resource file directory
-    wrapProgram $out/bin/Rack --add-flags "-g $out"
+    wrapProgram $out/bin/Rack --add-flags "-s $out/share/vcv-rack"
   '';
 
   meta = with stdenv.lib; {

diff --git a/pkgs/applications/audio/vcv-rack/glfw.patch b/pkgs/applications/audio/vcv-rack/glfw.patch
@@ -0,0 +1,13 @@
+diff --git a/src/init.c b/src/init.c
+index af4a579e..317e25b8 100644
+--- a/src/init.c
++++ b/src/init.c
+@@ -339,7 +339,7 @@ GLFWAPI GLFWerrorfun glfwSetErrorCallback(GLFWerrorfun cbfun)
+
+ char glfwOpenedFilename[1024];
+
+-const char *glfwGetOpenedFilename()
++GLFWAPI const char *glfwGetOpenedFilename()
+ {
+     if (glfwOpenedFilename[0])
+     {
diff --git a/pkgs/applications/audio/vcv-rack/rack-minimize-vendoring.patch b/pkgs/applications/audio/vcv-rack/rack-minimize-vendoring.patch
@@ -0,0 +1,14 @@
+diff -ru a/Makefile b/Makefile
+--- a/Makefile	1970-01-01 01:00:01.000000000 +0100
++++ b/Makefile	1970-01-01 01:00:01.000000000 +0100
+@@ -21,8 +21,8 @@
+ build/dep/osdialog/osdialog_gtk2.c.o: FLAGS += $(shell pkg-config --cflags gtk+-2.0)
+
+ 	LDFLAGS += -rdynamic \
+-		dep/lib/libglfw3.a dep/lib/libGLEW.a dep/lib/libjansson.a dep/lib/libspeexdsp.a dep/lib/libzip.a dep/lib/libz.a dep/lib/librtmidi.a dep/lib/librtaudio.a dep/lib/libcurl.a dep/lib/libssl.a dep/lib/libcrypto.a \
+-		-lpthread -lGL -ldl -lX11 -lasound -ljack \
++		-lGLEW -ljansson -lspeexdsp -lzip -lz -lrtmidi -lrtaudio -lcurl -lssl -lcrypto \
++		-lpthread -lGL -ldl -lX11 -lasound -ljack -lglfw \
+ 		$(shell pkg-config --libs gtk+-2.0)
+ 	TARGET := Rack
+ endif
diff --git a/pkgs/applications/editors/emacs-modes/elpa-packages.nix b/pkgs/applications/editors/emacs-modes/elpa-packages.nix
@@ -50,4 +50,4 @@ self:
 
     elpaPackages = super // overrides;
 
-  in elpaPackages // { inherit elpaBuild elpaPackages; }
+  in elpaPackages // { inherit elpaBuild; }
diff --git a/pkgs/applications/editors/emacs-modes/emacs-libvterm/default.nix b/pkgs/applications/editors/emacs-modes/emacs-libvterm/default.nix
Original file line number	Diff line number	Diff line change
		@@ -50,4 +50,4 @@ self:

		elpaPackages = super // overrides;

		in elpaPackages // { inherit elpaBuild elpaPackages; }
		in elpaPackages // { inherit elpaBuild; }