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

NixOS · Sep 8, 2017 · febd5e3 · febd5e3
2 parents 0061fae + e9183fd
commit febd5e3
Show file tree

Hide file tree

Showing 85 changed files with 2,015 additions and 993 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -7,15 +7,15 @@
 # For documentation on this file, see https://help.github.com/articles/about-codeowners/
 # Mentioned users will get code review requests.
 
+# This file
+.github/CODEOWNERS @edolstra
+
 # Boostraping and core infra
-pkgs/stdenv/    @Ericson2314
-pkgs/build-support/cc-wrapper/  @Ericson2314
+pkgs/stdenv/    @edolstra
+pkgs/build-support/cc-wrapper/  @edolstra
 
 # Libraries
-lib/  @Profpatsch
-
-# Build-Support
-pkgs/build-support  @Profpatsch
+lib/  @edolstra
 
 # Python-related code and docs
 pkgs/top-level/python-packages.nix      @FRidh

diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
@@ -254,7 +254,6 @@
       hydra-queue-runner = 235;
       hydra-www = 236;
       syncthing = 237;
-      mfi = 238;
       caddy = 239;
       taskd = 240;
       factorio = 241;
@@ -522,7 +521,6 @@
       octoprint = 230;
       radicale = 234;
       syncthing = 237;
-      #mfi = 238; # unused
       caddy = 239;
       taskd = 240;
       factorio = 241;

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
@@ -458,7 +458,6 @@
   ./services/networking/lldpd.nix
   ./services/networking/logmein-hamachi.nix
   ./services/networking/mailpile.nix
-  ./services/networking/mfi.nix
   ./services/networking/mjpg-streamer.nix
   ./services/networking/minidlna.nix
   ./services/networking/miniupnpd.nix

diff --git a/nixos/modules/services/mail/postfix.nix b/nixos/modules/services/mail/postfix.nix
@@ -836,11 +836,5 @@ in
     (mkIf (cfg.dnsBlacklists != []) {
       services.postfix.mapFiles."client_access" = checkClientAccessFile;
     })
-    (mkIf (cfg.extraConfig != "") {
-      warnings = [ "The services.postfix.extraConfig option was deprecated. Please use services.postfix.config instead." ];
-    })
-    (mkIf (cfg.extraMasterConf != "") {
-      warnings = [ "The services.postfix.extraMasterConf option was deprecated. Please use services.postfix.masterConfig instead." ];
-    })
   ]);
 }
diff --git a/nixos/modules/services/networking/mfi.nix b/nixos/modules/services/networking/mfi.nix
diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix
@@ -81,8 +81,8 @@ in rec {
         (all nixos.tests.boot.uefiUsb)
         (all nixos.tests.boot-stage1)
         nixos.tests.hibernate.x86_64-linux # i686 is flaky, see #23107
-        nixos.tests.docker.x86_64-linux
-        nixos.tests.docker-edge.x86_64-linux
+        nixos.tests.docker
+        nixos.tests.docker-edge
         (all nixos.tests.ecryptfs)
         (all nixos.tests.env)
         (all nixos.tests.ipv6)

diff --git a/nixos/release.nix b/nixos/release.nix
@@ -263,10 +263,10 @@ in rec {
   tests.plasma5 = callTest tests/plasma5.nix {};
   tests.keymap = callSubTests tests/keymap.nix {};
   tests.initrdNetwork = callTest tests/initrd-network.nix {};
-  tests.kernel-copperhead = tests/kernel-copperhead.nix {};
-  tests.kernel-latest = tests/kernel-latest.nix {};
-  tests.kernel-lts = tests/kernel-lts.nix {};
-  tests.kernel-params = tests/kernel-params.nix {};
+  tests.kernel-copperhead = callTest tests/kernel-copperhead.nix {};
+  tests.kernel-latest = callTest tests/kernel-latest.nix {};
+  tests.kernel-lts = callTest tests/kernel-lts.nix {};
+  tests.kernel-params = callTest tests/kernel-params.nix {};
   tests.keystone = callTest tests/keystone.nix {};
   tests.kubernetes = hydraJob (import tests/kubernetes.nix { system = "x86_64-linux"; });
   tests.latestKernel.login = callTest tests/login.nix { latestKernel = true; };

diff --git a/pkgs/applications/audio/rosegarden/default.nix b/pkgs/applications/audio/rosegarden/default.nix
@@ -1,24 +1,26 @@
-{ stdenv, fetchurl, qt4, pkgconfig, ladspaPlugins, ladspaH,
+{ stdenv, fetchurl, cmake, qt4, pkgconfig, ladspaPlugins, ladspaH,
   dssi, liblo, liblrdf, fftwSinglePrec, libsndfile,
   libsamplerate, perl, makedepend, libjack2,
   withLirc ? false, lirc ? null } :
 
 stdenv.mkDerivation (rec {
-  version = "15.08";
+  version = "17.04";
   name = "rosegarden-${version}";
+
   src = fetchurl {
     url  = "mirror://sourceforge/rosegarden/${name}.tar.bz2";
-    sha256 = "1pk24bhpsmvn6rkqgll31na44w03banra1y7kiqd0gajlnw7wlls";
+    sha256 = "1khfcj22asdhjh0jvhkqsz200wgmigkhsrcz09ffia5hqm0n32lq";
   };
 
-  QTDIR=qt4;
-
-  buildInputs = [ qt4 pkgconfig ladspaPlugins ladspaH dssi liblo liblrdf fftwSinglePrec
-                  libsndfile libsamplerate perl makedepend libjack2 ]
-		++ stdenv.lib.optional withLirc [ lirc ];
-
-  #enableParallelBuilding = true; issues on hydra
-
+  QTDIR = qt4;
+
+  buildInputs = [
+    cmake qt4 pkgconfig ladspaPlugins ladspaH dssi liblo liblrdf fftwSinglePrec
+    libsndfile libsamplerate perl makedepend libjack2
+  ] ++ stdenv.lib.optional withLirc [ lirc ];
+
+  enableParallelBuilding = true;
+
   meta = with stdenv.lib; {
     homepage = http://www.rosegardenmusic.com/;
     description = "Music composition and editing environment";

diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "atom-${version}";
-  version = "1.19.4";
+  version = "1.19.7";
 
   src = fetchurl {
     url = "https://github.com/atom/atom/releases/download/v${version}/atom-amd64.deb";
-    sha256 = "13k98ghz943yd5lqsbsvp1qy79lhgi3vww97qhqcbmmh15n0gsb0";
+    sha256 = "0ividd7bmx0fqz1ykcx5cbnd6qyms1h7r662pcclyzzm3vxj9zif";
     name = "${name}.deb";
   };
 

diff --git a/pkgs/applications/graphics/mcomix/default.nix b/pkgs/applications/graphics/mcomix/default.nix
@@ -11,13 +11,10 @@ python27Packages.buildPythonApplication rec {
 
     propagatedBuildInputs = with python27Packages; [ pygtk pillow ];
 
-    postPatch = ''
-      sed -i -e '/test_suite/d' setup.py
-    '';
+    doCheck = false;
 
     meta = {
       description = "Image viewer designed to handle comic books";
-
       longDescription = ''
         MComix is an user-friendly, customizable image viewer. It is specifically
         designed to handle comic books, but also serves as a generic viewer.
@@ -28,9 +25,10 @@ python27Packages.buildPythonApplication rec {
         MComix is a fork of the Comix project, and aims to add bug fixes and
         stability improvements after Comix development came to a halt in late 2009.
       '';
-
       homepage = http://mcomix.sourceforge.net/;
       license = stdenv.lib.licenses.gpl2;
-      maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
+      maintainers = with stdenv.lib.maintainers; [ fuuzetsu AndersonTorres ];
     };
 }
+# TODO:
+# - error in check phase
diff --git a/pkgs/applications/graphics/yed/default.nix b/pkgs/applications/graphics/yed/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   name = "yEd-${version}";
-  version = "3.17";
+  version = "3.17.1";
 
   src = requireFile {
     name = "${name}.zip";
     url = "https://www.yworks.com/en/products/yfiles/yed/";
-    sha256 = "1wk58cql90y3i5l7jlxqfjjgf26i0zrv5cn0p9npgagaw6aiw2za";
+    sha256 = "0fk1gai7yghfmfvx1rfzdnpwihbq6hqzncyk6zkpqdrf6zz576nl";
   };
 
   nativeBuildInputs = [ unzip makeWrapper ];

diff --git a/pkgs/applications/misc/slic3r/default.nix b/pkgs/applications/misc/slic3r/default.nix
@@ -12,6 +12,10 @@ stdenv.mkDerivation rec {
     sha256 = "1z8h11k29b7z49z5k8ikyfiijyycy1q3krlzi8hfd0vdybvymw21";
   };
 
+  patches = [
+    ./gcc6.patch
+  ];
+
   buildInputs = with perlPackages; [ perl makeWrapper which
     EncodeLocale MathClipper ExtUtilsXSpp threads
     MathConvexHullMonotoneChain MathGeometryVoronoi MathPlanePath Moo
@@ -31,6 +35,7 @@ stdenv.mkDerivation rec {
 
   buildPhase = ''
     export SLIC3R_NO_AUTO=true
+    export LD=$CXX
     export PERL5LIB="./xs/blib/arch/:./xs/blib/lib:$PERL5LIB"
 
     substituteInPlace Build.PL \

diff --git a/pkgs/applications/misc/slic3r/gcc6.patch b/pkgs/applications/misc/slic3r/gcc6.patch
@@ -0,0 +1,40 @@
+diff --git i/xs/src/libslic3r/Config.hpp w/xs/src/libslic3r/Config.hpp
+index 49e999b..d9b65d8 100644
+--- i/xs/src/libslic3r/Config.hpp
++++ w/xs/src/libslic3r/Config.hpp
+@@ -65,7 +65,7 @@ class ConfigOptionFloat : public ConfigOption
+
+     bool deserialize(std::string str) {
+         std::istringstream iss(str);
+-        return iss >> this->value;
++        return bool(iss >> this->value);
+     };
+ };
+
+@@ -124,7 +124,7 @@ class ConfigOptionInt : public ConfigOption
+
+     bool deserialize(std::string str) {
+         std::istringstream iss(str);
+-        return iss >> this->value;
++        return bool(iss >> this->value);
+     };
+ };
+
+@@ -249,7 +249,7 @@ class ConfigOptionPercent : public ConfigOption
+     bool deserialize(std::string str) {
+         // don't try to parse the trailing % since it's optional
+         std::istringstream iss(str);
+-        return iss >> this->value;
++        return bool(iss >> this->value);
+     };
+ };
+
+@@ -279,7 +279,7 @@ class ConfigOptionFloatOrPercent : public ConfigOption
+     bool deserialize(std::string str) {
+         this->percent = str.find_first_of("%") != std::string::npos;
+         std::istringstream iss(str);
+-        return iss >> this->value;
++        return bool(iss >> this->value);
+     };
+ };
+
diff --git a/pkgs/applications/misc/truecrypt/builder.sh b/pkgs/applications/misc/truecrypt/builder.sh
diff --git a/pkgs/applications/misc/truecrypt/default.nix b/pkgs/applications/misc/truecrypt/default.nix
@@ -46,7 +46,24 @@ library, use the 'NOGUI' parameter:
 
 stdenv.mkDerivation {
   name = "truecrypt-7.1a";
-  builder = ./builder.sh;
+
+  patchPhase = "patch -p0 < ${./gcc6.patch}";
+
+  preBuild = ''
+    cp $pkcs11h pkcs11.h
+    cp $pkcs11th pkcs11t.h
+    cp $pkcs11fh pkcs11f.h
+  '';
+
+  makeFlags = [
+    ''PKCS11_INC="`pwd`"''
+    (if wxGUI then "" else "NOGUI=1")
+  ];
+
+  installPhase = ''
+    install -D -t $out/bin Main/truecrypt
+    install -D License.txt $out/share/$name/LICENSE
+  '';
 
   src = fetchurl {
     url = https://fossies.org/linux/misc/old/TrueCrypt-7.1a-Source.tar.gz;
@@ -68,14 +85,13 @@ stdenv.mkDerivation {
     sha256 = "5ae6a4f32ca737e02def3bf314c9842fb89be82bf00b6f4022a97d8d565522b8";
   };
 
-  buildInputs = [ pkgconfig fuse devicemapper wxGTK nasm ]; 
-  makeFlags = if wxGUI then "" else "NOGUI=1";
+  buildInputs = [ pkgconfig fuse devicemapper wxGTK nasm ];
 
   meta = {
     description = "Free Open-Source filesystem on-the-fly encryption";
     homepage = http://www.truecrypt.org/;
     license = "TrueCrypt License Version 2.6";
-    maintainers = with stdenv.lib.maintainers; [viric];
+    maintainers = with stdenv.lib.maintainers; [ viric ryantm ];
     platforms = with stdenv.lib.platforms; linux;
   };
 }