Merge remote-tracking branch 'upstream/master' into staging

maintainers/maintainer-list.nix

@@ -221,6 +221,11 @@
     github = "amiloradovsky";
     name = "Andrew Miloradovsky";
   };
+  aminb = {
+    email = "amin@aminb.org";
+    github = "aminb";
+    name = "Amin Bandali";
+  };
   aminechikhaoui = {
     email = "amine.chikhaoui91@gmail.com";
     github = "AmineChikhaoui";

nixos/modules/services/networking/shairport-sync.nix

@@ -27,7 +27,7 @@ in
       };
 
       arguments = mkOption {
-        default = "-v -o pulse";
+        default = "-v -d pulse";
         description = ''
           Arguments to pass to the daemon. Defaults to a local pulseaudio
           server.
@@ -72,6 +72,7 @@ in
         serviceConfig = {
           User = cfg.user;
           ExecStart = "${pkgs.shairport-sync}/bin/shairport-sync ${cfg.arguments}";
+          RuntimeDirectory = "shairport-sync";
         };
       };
 

pkgs/applications/networking/instant-messengers/bluejeans/default.nix

@@ -0,0 +1,49 @@
+{ stdenv, fetchurl, rpmextract, patchelf, libnotify, libcap, cairo, pango, fontconfig, udev, dbus
+, gtk2, atk, expat, gdk_pixbuf, freetype, nspr, glib, nss, gconf, libX11, libXrender, libXtst, libXdamage
+, libXi, libXext, libXfixes, libXcomposite, alsaLib, bash
+}:
+
+stdenv.mkDerivation rec {
+  name = "bluejeans-${version}";
+  version = "1.36.9";
+
+  src =
+    fetchurl {
+      url = "https://swdl.bluejeans.com/desktop/linux/1.36/${version}/bluejeans-${version}.x86_64.rpm";
+      sha256 = "0sbv742pzqd2cxn3kq10lfi16jah486i9kyrmi8l1rpb9fhyw2m1";
+    };
+
+  buildInputs = [ patchelf rpmextract ];
+
+  libPath =
+    stdenv.lib.makeLibraryPath
+       [ libnotify libcap cairo pango fontconfig gtk2 atk expat gdk_pixbuf dbus udev.lib
+         freetype nspr glib stdenv.cc stdenv.cc.cc.lib nss gconf libX11 libXrender libXtst libXdamage
+         libXi libXext libXfixes libXcomposite alsaLib
+       ];
+
+  buildCommand = ''
+    mkdir -p $out/bin/
+    cd $out
+    rpmextract $src
+    patchelf \
+      --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
+      opt/bluejeans/bluejeans-bin
+    patchelf \
+      --set-rpath ${libPath} \
+      opt/bluejeans/bluejeans-bin
+    patchelf \
+      --replace-needed libudev.so.0 libudev.so.1 \
+      opt/bluejeans/bluejeans-bin
+    ln -s $out/opt/bluejeans/bluejeans $out/bin/bluejeans
+    substituteInPlace $out/bin/bluejeans \
+      --replace '#!/bin/bash' '#!${bash}/bin/bash'
+    chmod +x $out/bin/bluejeans
+  '';
+
+  meta = {
+    description = "Video, audio, and web conferencing that works together with the collaboration tools you use every day.";
+    license = stdenv.lib.licenses.unfree;
+    platforms = [ "x86_64-linux" ];
+  };
+}

pkgs/development/tools/alloy/default.nix

@@ -1,58 +1,72 @@
-{ stdenv, fetchurl, jre, makeDesktopItem }:
+{ stdenv, fetchurl, jre, makeWrapper, makeDesktopItem }:
 
-stdenv.mkDerivation rec {
+let generic = { major, version, src }:
-  name = "alloy-${version}";
-  version = "4.2_2015-02-22";
 
-  src = fetchurl {
+  stdenv.mkDerivation rec {
-    sha256 = "0p93v8jwx9prijpikkgmfdzb9qn8ljmvga5d9wvrkxddccjx9k28";
+    name = "${nameMajor}-${version}";
-    url = "http://alloy.mit.edu/alloy/downloads/alloy${version}.jar";
+    nameMajor = "alloy${major}";
-  };
 
-  desktopItem = makeDesktopItem rec {
+    desktopItem = makeDesktopItem rec {
-    name = "alloy";
+      name = "${nameMajor}";
-    exec = name;
+      exec = name;
-    icon = name;
+      icon = name;
-    desktopName = "Alloy";
+      desktopName = "Alloy ${major}";
-    genericName = "Relational modelling tool";
+      genericName = "Relational modelling tool";
-    comment = meta.description;
+      comment = meta.description;
-    categories = "Development;IDE;Education;";
+      categories = "Development;IDE;Education;";
-  };
+    };
 
-  buildInputs = [ jre ];
+    nativeBuildInputs = [ makeWrapper ];
 
-  phases = [ "installPhase" ];
+    buildCommand = ''
+      jar=$out/share/alloy/${nameMajor}.jar
+      install -Dm644 ${src} $jar
 
-  installPhase = ''
+      mkdir -p $out/bin
-    jar=$out/share/alloy/alloy${version}.jar
+      makeWrapper ${jre}/bin/java $out/bin/${nameMajor} --add-flags \
+       "-jar $jar"
 
-    install -Dm644 ${src} $jar
+      install -Dm644 ${./icon.png} $out/share/pixmaps/${nameMajor}.png
-
+      cp -r ${desktopItem}/share/applications $out/share
-    cat << EOF > alloy
-    #!${stdenv.shell}
-    exec ${jre}/bin/java -jar $jar "\''${@}"
-    EOF
-
-    install -Dm755 alloy $out/bin/alloy
-
-    install -Dm644 ${./icon.png} $out/share/pixmaps/alloy.png
-    cp -r ${desktopItem}/share/applications $out/share
-  '';
-
-  meta = with stdenv.lib; {
-    description = "Language & tool for relational models";
-    longDescription = ''
-      Alloy is a language for describing structures and a tool for exploring
-      them. An Alloy model is a collection of constraints that describes a set
-      of structures, e.g. all the possible security configurations of a web
-      application, or all the possible topologies of a switching network. The
-      Alloy Analyzer is a solver that takes the constraints of a model and
-      finds structures that satisfy them. Structures are displayed graphically,
-      and their appearance can be customized for the domain at hand.
     '';
-    homepage = http://alloy.mit.edu/;
+
-    downloadPage = http://alloy.mit.edu/alloy/download.html;
+    meta = with stdenv.lib; {
-    license = licenses.mit;
+      description = "Language & tool for relational models";
-    platforms = platforms.linux;
+      longDescription = ''
+        Alloy is a language for describing structures and a tool for exploring
+        them. An Alloy model is a collection of constraints that describes a set
+        of structures, e.g. all the possible security configurations of a web
+        application, or all the possible topologies of a switching network. The
+        Alloy Analyzer is a solver that takes the constraints of a model and
+        finds structures that satisfy them. Structures are displayed graphically,
+        and their appearance can be customized for the domain at hand.
+      '';
+      homepage = http://alloytools.org/;
+      downloadPage = http://alloytools.org/download.html;
+      license = licenses.mit;
+      platforms = platforms.linux;
+      maintainers = with maintainers; [ aminb ];
+    };
   };
+
+in rec {
+  alloy4 = let version = "4.2_2015-02-22"; in generic {
+    major = "4";
+    inherit version;
+    src = fetchurl {
+      sha256 = "0p93v8jwx9prijpikkgmfdzb9qn8ljmvga5d9wvrkxddccjx9k28";
+      url = "http://alloytools.org/download/alloy${version}.jar";
+    };
+  };
+
+  alloy5 = let version = "5.0.0.1"; in generic {
+    major = "5";
+    inherit version;
+    src = fetchurl {
+      sha256 = "0kz6i9av9ksjk62lx0dxx8xr542iqvbqd14m1f9h8xpf72c25xw4";
+      url = "https://github.com/AlloyTools/org.alloytools.alloy/releases/download/v${version}/Alloy-${version}.jar";
+    };
+  };
+
+  alloy = alloy4;
 }

pkgs/servers/shairport-sync/default.nix

@@ -28,9 +28,9 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   configureFlags = [
-    "--with-alsa" "--with-pipe" "--with-pulseaudio" "--with-stdout"
+    "--with-alsa" "--with-pipe" "--with-pa" "--with-stdout"
     "--with-avahi" "--with-ssl=openssl" "--with-soxr"
-    "--without-configfiles" "--without-initscript"
+    "--without-configfiles"
   ];
 
   meta = with stdenv.lib; {

pkgs/top-level/all-packages.nix

@@ -7932,7 +7932,10 @@ with pkgs;
     for more information.
   '';
 
-  alloy = callPackage ../development/tools/alloy { };
+  inherit (callPackage ../development/tools/alloy { })
+    alloy4
+    alloy5
+    alloy;
 
   adtool = callPackage ../tools/admin/adtool { };
 
@@ -15675,6 +15678,12 @@ with pkgs;
 
   bluejeans = callPackage ../applications/networking/browsers/mozilla-plugins/bluejeans { };
 
+  bluejeans-gui = callPackage ../applications/networking/instant-messengers/bluejeans {
+    gconf = pkgs.gnome2.GConf;
+    inherit (pkgs.xorg) libX11 libXrender libXtst libXdamage
+                        libXi libXext libXfixes libXcomposite;
+  };
+
   bombono = callPackage ../applications/video/bombono {};
 
   bomi = libsForQt5.callPackage ../applications/video/bomi {