Update yarn to 1.1.0

Fix GitLab service and update documentation. Fixes #30059.

(cherry picked from commit 03a5d729ef)

.github/CODEOWNERS

@@ -7,46 +7,17 @@
 # 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/    @edolstra
-pkgs/build-support/cc-wrapper/  @edolstra
-
-# Libraries
-lib/  @edolstra
-
 # Python-related code and docs
 pkgs/top-level/python-packages.nix	@FRidh
 pkgs/development/interpreters/python/*	@FRidh
 pkgs/development/python-modules/*	@FRidh
 doc/languages-frameworks/python.md	@FRidh
 
-# Haskell
-pkgs/development/compilers/ghc                       @peti
-pkgs/development/haskell-modules                     @peti
-pkgs/development/haskell-modules/default.nix         @peti
-pkgs/development/haskell-modules/generic-builder.nix @peti
-pkgs/development/haskell-modules/hoogle.nix          @peti
-
-# R
-pkgs/applications/science/math/R @peti
-pkgs/development/r-modules       @peti
+# Boostraping and core infra
+pkgs/stdenv/	@Ericson2314
+pkgs/build-support/cc-wrapper/	@Ericson2314
 
 # Darwin-related
 pkgs/stdenv/darwin/*	@copumpkin @LnL7
 pkgs/os-specific/darwin/*	@LnL7
 pkgs/os-specific/darwin/apple-source-releases/*	@copumpkin
-
-# Beam-related (Erlang, Elixir, LFE, etc)
-pkgs/development/beam-modules/*	@gleber
-pkgs/development/interpreters/erlang/*	@gleber
-pkgs/development/interpreters/lfe/*	@gleber
-pkgs/development/interpreters/elixir/*	@gleber
-pkgs/development/tools/build-managers/rebar/*	@gleber
-pkgs/development/tools/build-managers/rebar3/*	@gleber
-pkgs/development/tools/erlang/*	@gleber
-
-# Jetbrains
-pkgs/applications/editors/jetbrains @edwtjo

.version

@@ -1 +1 @@
-18.03
+17.09

doc/languages-frameworks/haskell.md

@@ -875,17 +875,12 @@ to your own Haskell packages and integrate that in a Continuous Integration
 server like [hydra](https://nixos.org/hydra/) to assure your packages maintain a
 minimum level of quality. This section discusses some of these functions.
 
-#### failOnAllWarnings
-
-Applying `haskell.lib.failOnAllWarnings` to a Haskell package enables the
-`-Wall` and `-Werror` GHC options to turn all warnings into build failures.
-
 #### buildStrictly
 
-Applying `haskell.lib.buildStrictly` to a Haskell package calls
-`failOnAllWarnings` on the given package to turn all warnings into build
-failures. Additionally the source of your package is gotten from first invoking
-`cabal sdist` to ensure all needed files are listed in the Cabal file.
+Applying `haskell.lib.buildStrictly` to a Haskell package enables the `-Wall`
+and `-Werror` GHC options to turn all warnings into build failures. Additionally
+the source of your package is gotten from first invoking `cabal sdist` to ensure
+all needed files are listed in the Cabal file.
 
 #### checkUnusedPackages
 

lib/maintainers.nix

@@ -107,7 +107,6 @@
   choochootrain = "Hurshal Patel <hurshal@imap.cc>";
   chris-martin = "Chris Martin <ch.martin@gmail.com>";
   chrisjefferson = "Christopher Jefferson <chris@bubblescope.net>";
-  chrisrosset = "Christopher Rosset <chris@rosset.org.uk>";
   christopherpoole = "Christopher Mark Poole <mail@christopherpoole.net>";
   ciil = "Simon Lackerbauer <simon@lackerbauer.com>";
   ckampka = "Christian Kampka <christian@kampka.net>";
@@ -115,7 +114,6 @@
   cleverca22 = "Michael Bishop <cleverca22@gmail.com>";
   cmcdragonkai = "Roger Qiu <roger.qiu@matrix.ai>";
   cmfwyp = "cmfwyp <cmfwyp@riseup.net>";
-  cobbal = "Andrew Cobb <andrew.cobb@gmail.com>";
   coconnor = "Corey O'Connor <coreyoconnor@gmail.com>";
   codsl = "codsl <codsl@riseup.net>";
   codyopel = "Cody Opel <codyopel@gmail.com>";
@@ -136,7 +134,6 @@
   dancek = "Hannu Hartikainen <hannu.hartikainen@gmail.com>";
   danielfullmer = "Daniel Fullmer <danielrf12@gmail.com>";
   dasuxullebt = "Christoph-Simon Senjak <christoph.senjak@googlemail.com>";
-  david50407 = "David Kuo <me@davy.tw>";
   davidak = "David Kleuker <post@davidak.de>";
   davidrusu = "David Rusu <davidrusu.me@gmail.com>";
   davorb = "Davor Babic <davor@davor.se>";
@@ -188,7 +185,6 @@
   ellis = "Ellis Whitehead <nixos@ellisw.net>";
   eperuffo = "Emanuele Peruffo <info@emanueleperuffo.com>";
   epitrochoid = "Mabry Cervin <mpcervin@uncg.edu>";
-  eqyiel = "Ruben Maher <r@rkm.id.au>";
   ericbmerritt = "Eric Merritt <eric@afiniate.com>";
   ericsagnes = "Eric Sagnes <eric.sagnes@gmail.com>";
   erikryb = "Erik Rybakken <erik.rybakken@math.ntnu.no>";
@@ -199,9 +195,8 @@
   exlevan = "Alexey Levan <exlevan@gmail.com>";
   expipiplus1 = "Joe Hermaszewski <nix@monoid.al>";
   fadenb = "Tristan Helmich <tristan.helmich+nixos@gmail.com>";
-  falsifian = "James Cook <james.cook@utoronto.ca>";
   fare = "Francois-Rene Rideau <fahree@gmail.com>";
-  fgaz = "Francesco Gazzetta <francygazz@gmail.com>";
+  falsifian = "James Cook <james.cook@utoronto.ca>";
   florianjacob = "Florian Jacob <projects+nixos@florianjacob.de>";
   flosse = "Markus Kohlhase <mail@markus-kohlhase.de>";
   fluffynukeit = "Daniel Austin <dan@fluffynukeit.com>";
@@ -288,10 +283,10 @@
   joelmo = "Joel Moberg <joel.moberg@gmail.com>";
   joelteon = "Joel Taylor <me@joelt.io>";
   johbo = "Johannes Bornhold <johannes@bornhold.name>";
-  johnmh = "John M. Harris, Jr. <johnmh@openblox.org>";
   johnramsden = "John Ramsden <johnramsden@riseup.net>";
   joko = "Ioannis Koutras <ioannis.koutras@gmail.com>";
   jonafato = "Jon Banafato <jon@jonafato.com>";
+  jpbernardy = "Jean-Philippe Bernardy <jeanphilippe.bernardy@gmail.com>";
   jpierre03 = "Jean-Pierre PRUNARET <nix@prunetwork.fr>";
   jpotier = "Martin Potier <jpo.contributes.to.nixos@marvid.fr>";
   jraygauthier = "Raymond Gauthier <jraygauthier@gmail.com>";
@@ -299,7 +294,6 @@
   juliendehos = "Julien Dehos <dehos@lisic.univ-littoral.fr>";
   jwiegley = "John Wiegley <johnw@newartisans.com>";
   jwilberding = "Jordan Wilberding <jwilberding@afiniate.com>";
-  jyp = "Jean-Philippe Bernardy <jeanphilippe.bernardy@gmail.com>";
   jzellner = "Jeff Zellner <jeffz@eml.cc>";
   kaiha = "Kai Harries <kai.harries@gmail.com>";
   kamilchm = "Kamil Chmielewski <kamil.chm@gmail.com>";
@@ -339,7 +333,6 @@
   lovek323 = "Jason O'Conal <jason@oconal.id.au>";
   lowfatcomputing = "Andreas Wagner <andreas.wagner@lowfatcomputing.org>";
   lsix = "Lancelot SIX <lsix@lancelotsix.com>";
-  ltavard = "Laure Tavard <laure.tavard@univ-grenoble-alpes.fr>";
   lucas8 = "Luc Chabassier <luc.linux@mailoo.org>";
   ludo = "Ludovic Courtès <ludo@gnu.org>";
   lufia = "Kyohei Kadota <lufia@lufia.org>";
@@ -375,7 +368,6 @@
   meditans = "Carlo Nucera <meditans@gmail.com>";
   meisternu = "Matt Miemiec <meister@krutt.org>";
   metabar = "Celine Mercier <softs@metabarcoding.org>";
-  mgdelacroix = "Miguel de la Cruz <mgdelacroix@gmail.com>";
   mguentner = "Maximilian Güntner <code@klandest.in>";
   mic92 = "Jörg Thalheim <joerg@thalheim.io>";
   michaelpj = "Michael Peyton Jones <michaelpj@gmail.com>";
@@ -385,6 +377,7 @@
   mikefaille = "Michaël Faille <michael@faille.io>";
   miltador = "Vasiliy Solovey <miltador@yandex.ua>";
   mimadrid = "Miguel Madrid <mimadrid@ucm.es>";
+  mingchuan = "Ming Chuan <ming@culpring.com>";
   mirdhyn = "Merlin Gaillard <mirdhyn@gmail.com>";
   mirrexagon = "Andrew Abbott <mirrexagon@mirrexagon.com>";
   mjanczyk = "Marcin Janczyk <m@dragonvr.pl>";
@@ -458,7 +451,6 @@
   periklis = "theopompos@gmail.com";
   pesterhazy = "Paulus Esterhazy <pesterhazy@gmail.com>";
   peterhoeg = "Peter Hoeg <peter@hoeg.com>";
-  peterromfeldhk = "Peter Romfeld <peter.romfeld.hk@gmail.com>";
   peti = "Peter Simons <simons@cryp.to>";
   philandstuff = "Philip Potter <philip.g.potter@gmail.com>";
   phile314 = "Philipp Hausmann <nix@314.ch>";
@@ -513,7 +505,6 @@
   robberer = "Longrin Wischnewski <robberer@freakmail.de>";
   robbinch = "Robbin C. <robbinch33@gmail.com>";
   roberth = "Robert Hensing <nixpkgs@roberthensing.nl>";
-  robertodr = "Roberto Di Remigio <roberto.diremigio@gmail.com>";
   robgssp = "Rob Glossop <robgssp@gmail.com>";
   roblabla = "Robin Lambertz <robinlambertz+dev@gmail.com>";
   roconnor = "Russell O'Connor <roconnor@theorem.ca>";
@@ -551,10 +542,8 @@
   shell = "Shell Turner <cam.turn@gmail.com>";
   shlevy = "Shea Levy <shea@shealevy.com>";
   siddharthist = "Langston Barrett <langston.barrett@gmail.com>";
-  sifmelcara = "Ming Chuan <ming@culpring.com>";
   sigma = "Yann Hodique <yann.hodique@gmail.com>";
   simonvandel = "Simon Vandel Sillesen <simon.vandel@gmail.com>";
-  sivteck = "Sivaram Balakrishnan <sivaram1992@gmail.com>";
   sjagoe = "Simon Jagoe <simon@simonjagoe.com>";
   sjmackenzie = "Stewart Mackenzie <setori88@gmail.com>";
   sjourdois = "Stéphane ‘kwisatz’ Jourdois <sjourdois@gmail.com>";
@@ -576,12 +565,10 @@
   sternenseemann = "Lukas Epple <post@lukasepple.de>";
   stesie = "Stefan Siegl <stesie@brokenpipe.de>";
   steveej = "Stefan Junker <mail@stefanjunker.de>";
-  stumoss = "Stuart Moss <samoss@gmail.com>";
   SuprDewd = "Bjarki Ágúst Guðmundsson <suprdewd@gmail.com>";
   swarren83 = "Shawn Warren <shawn.w.warren@gmail.com>";
   swflint = "Samuel W. Flint <swflint@flintfam.org>";
   swistak35 = "Rafał Łasocha <me@swistak35.com>";
-  symphorien = "Guillaume Girol <symphorien_nixpkgs@xlumurb.eu>";
   szczyp = "Szczyp <qb@szczyp.com>";
   sztupi = "Attila Sztupak <attila.sztupak@gmail.com>";
   taeer = "Taeer Bar-Yam <taeer@necsi.edu>";
@@ -591,15 +578,14 @@
   taku0 = "Takuo Yonezawa <mxxouy6x3m_github@tatapa.org>";
   tari = "Peter Marheine <peter@taricorp.net>";
   tavyc = "Octavian Cerna <octavian.cerna@gmail.com>";
-  TealG = "Teal Gaure <~@Teal.Gr>";
+  ltavard = "Laure Tavard <laure.tavard@univ-grenoble-alpes.fr>";
   teh = "Tom Hunger <tehunger@gmail.com>";
-  telotortium = "Robert Irelan <rirelan@gmail.com>";
   teto = "Matthieu Coudron <mcoudron@hotmail.com>";
+  telotortium = "Robert Irelan <rirelan@gmail.com>";
   thall = "Niclas Thall <niclas.thall@gmail.com>";
   thammers = "Tobias Hammerschmidt <jawr@gmx.de>";
   the-kenny = "Moritz Ulrich <moritz@tarn-vedra.de>";
   theuni = "Christian Theune <ct@flyingcircus.io>";
-  ThomasMader = "Thomas Mader <thomas.mader@gmail.com>";
   thoughtpolice = "Austin Seipp <aseipp@pobox.com>";
   timbertson = "Tim Cuthbertson <tim@gfxmonk.net>";
   titanous = "Jonathan Rudenberg <jonathan@titanous.com>";
@@ -623,7 +609,6 @@
   #urkud = "Yury G. Kudryashov <urkud+nix@ya.ru>"; inactive since 2012
   uwap = "uwap <me@uwap.name>";
   vaibhavsagar = "Vaibhav Sagar <vaibhavsagar@gmail.com>";
-  valeriangalliat = "Valérian Galliat <val@codejam.info>";
   vandenoever = "Jos van den Oever <jos@vandenoever.info>";
   vanschelven = "Klaas van Schelven <klaas@vanschelven.com>";
   vanzef = "Ivan Solyankin <vanzef@gmail.com>";
@@ -640,6 +625,7 @@
   vlstill = "Vladimír Štill <xstill@fi.muni.cz>";
   vmandela = "Venkateswara Rao Mandela <venkat.mandela@gmail.com>";
   vmchale = "Vanessa McHale <tmchale@wisc.edu>";
+  valeriangalliat = "Valérian Galliat <val@codejam.info>";
   volhovm = "Mikhail Volkhov <volhovm.cs@gmail.com>";
   volth = "Jaroslavas Pocepko <jaroslavas@volth.com>";
   vozz = "Oliver Hunt <oliver.huntuk@gmail.com>";

maintainers/scripts/gnome.sh

@@ -6,7 +6,7 @@ GNOME_FTP=ftp.gnome.org/pub/GNOME/sources
 
 # projects that don't follow the GNOME major versioning, or that we don't want to
 # programmatically update
-NO_GNOME_MAJOR="ghex gtkhtml gdm gucharmap"
+NO_GNOME_MAJOR="ghex gtkhtml gdm"
 
 usage() {
   echo "Usage: $0 <show project>|<update project>|<update-all> [major.minor]" >&2

nixos/doc/manual/development/releases.xml

@@ -161,6 +161,11 @@
           </link>
         </para>
       </listitem>
+      <listitem>
+        <para>
+          Set a release date in the release notes.
+        </para>
+      </listitem>
       <listitem>
         <para>
           Change <literal>stableBranch</literal> to true and wait for channel to update.
@@ -195,7 +200,7 @@
       </listitem>
       <listitem>
         <para>
-          Send an email to nix-dev to announce the release with above information. Best to check how previous email was formulated
+          Send an email to nix-devel to announce the release with above information. Best to check how previous email was formulated
           to see what needs to be included.
         </para>
       </listitem>
@@ -223,27 +228,27 @@
       <tbody>
         <row>
           <entry>
-            2016-07-25
+            2018-01-31
           </entry>
           <entry>
-            Send email to nix-dev about upcoming branch-off
+            Send email to nix-devel about upcoming branch-off
           </entry>
         </row>
         <row>
           <entry>
-            2016-09-01
+            2018-02-28
           </entry>
           <entry>
-            <literal>release-16.09</literal> branch and corresponding jobsets are created,
+            <literal>release-18.03</literal> branch and corresponding jobsets are created,
             change freeze
           </entry>
         </row>
         <row>
           <entry>
-            2016-09-30
+            2018-03-29
           </entry>
           <entry>
-            NixOS 16.09 released
+            NixOS 18.03 released
           </entry>
         </row>
       </tbody>

nixos/doc/manual/release-notes/release-notes.xml

@@ -9,7 +9,6 @@
 <para>This section lists the release notes for each stable version of NixOS
 and current unstable revision.</para>
 
-<xi:include href="rl-1803.xml" />
 <xi:include href="rl-1709.xml" />
 <xi:include href="rl-1703.xml" />
 <xi:include href="rl-1609.xml" />

nixos/doc/manual/release-notes/rl-1709.xml

@@ -4,7 +4,7 @@
          version="5.0"
          xml:id="sec-release-17.09">
 
-<title>Release 17.09 (“Hummingbird”, 2017/09/??)</title>
+<title>Release 17.09 (“Hummingbird”, 2017/09/29)</title>
 
 <section xmlns="http://docbook.org/ns/docbook"
          xmlns:xlink="http://www.w3.org/1999/xlink"
@@ -419,7 +419,15 @@ FLUSH PRIVILEGES;
 </programlisting>
     </para>
   </listitem>
-
+  <listitem>
+    <para>
+      <literal>sha256</literal> argument value of
+      <literal>dockerTools.pullImage</literal> expression must be
+      updated since the mechanism to download the image has been
+      changed. Skopeo is now used to pull the image instead of the
+      Docker daemon.
+    </para>
+  </listitem>
   <listitem>
     <para>
       <literal>services.mysqlBackup</literal> now works by default

nixos/doc/manual/release-notes/rl-1803.xml

@@ -1,79 +0,0 @@
-<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-18.03">
-
-<title>Release 18.03 (“Impala”, 2018/03/??)</title>
-
-<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-18.03-highlights">
-
-<title>Highlights</title>
-
-<para>In addition to numerous new and upgraded packages, this release
-has the following highlights: </para>
-
-<itemizedlist>
-  <listitem>
-    <para>
-    </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"
-         version="5.0"
-         xml:id="sec-release-18.03-new-services">
-
-<title>New Services</title>
-
-<para>The following new services were added since the last release:</para>
-
-<itemizedlist>
-  <listitem>
-    <para></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"
-         version="5.0"
-         xml:id="sec-release-18.03-incompatibilities">
-
-<title>Backward Incompatibilities</title>
-
-<para>When upgrading from a previous release, please be aware of the
-following incompatible changes:</para>
-
-<itemizedlist>
-  <listitem>
-    <para></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"
-         version="5.0"
-         xml:id="sec-release-18.03-notable-changes">
-
-<title>Other Notable Changes</title>
-
-<itemizedlist>
-  <listitem>
-    <para>
-    </para>
-  </listitem>
-</itemizedlist>
-
-</section>
-</section>

nixos/modules/config/krb5.nix

@@ -0,0 +1,206 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  cfg = config.krb5;
+
+in
+
+{
+  ###### interface
+
+  options = {
+
+    krb5 = {
+
+      enable = mkOption {
+        default = false;
+        description = "Whether to enable Kerberos V.";
+      };
+
+      defaultRealm = mkOption {
+        default = "ATENA.MIT.EDU";
+        description = "Default realm.";
+      };
+
+      domainRealm = mkOption {
+        default = "atena.mit.edu";
+        description = "Default domain realm.";
+      };
+
+      kdc = mkOption {
+        default = "kerberos.mit.edu";
+        description = "Key Distribution Center";
+      };
+
+      kerberosAdminServer = mkOption {
+        default = "kerberos.mit.edu";
+        description = "Kerberos Admin Server.";
+      };
+
+    };
+
+  };
+
+  ###### implementation
+
+  config = mkIf config.krb5.enable {
+
+    environment.systemPackages = [ pkgs.krb5Full ];
+
+    environment.etc."krb5.conf".text =
+      ''
+        [libdefaults]
+            default_realm = ${cfg.defaultRealm}
+            encrypt = true
+
+        # The following krb5.conf variables are only for MIT Kerberos.
+            krb4_config = /etc/krb.conf
+            krb4_realms = /etc/krb.realms
+            kdc_timesync = 1
+            ccache_type = 4
+            forwardable = true
+            proxiable = true
+
+        # The following encryption type specification will be used by MIT Kerberos
+        # if uncommented.  In general, the defaults in the MIT Kerberos code are
+        # correct and overriding these specifications only serves to disable new
+        # encryption types as they are added, creating interoperability problems.
+
+        #   default_tgs_enctypes = aes256-cts arcfour-hmac-md5 des3-hmac-sha1 des-cbc-crc des-cbc-md5
+        #   default_tkt_enctypes = aes256-cts arcfour-hmac-md5 des3-hmac-sha1 des-cbc-crc des-cbc-md5
+        #   permitted_enctypes = aes256-cts arcfour-hmac-md5 des3-hmac-sha1 des-cbc-crc des-cbc-md5
+
+        # The following libdefaults parameters are only for Heimdal Kerberos.
+            v4_instance_resolve = false
+            v4_name_convert = {
+                host = {
+                    rcmd = host
+                    ftp = ftp
+                }
+                plain = {
+                    something = something-else
+                }
+            }
+            fcc-mit-ticketflags = true
+
+        [realms]
+            ${cfg.defaultRealm} = {
+                kdc = ${cfg.kdc}
+                admin_server = ${cfg.kerberosAdminServer}
+                #kpasswd_server = ${cfg.kerberosAdminServer}
+            }
+            ATHENA.MIT.EDU = {
+                kdc = kerberos.mit.edu:88
+                kdc = kerberos-1.mit.edu:88
+                kdc = kerberos-2.mit.edu:88
+                admin_server = kerberos.mit.edu
+                default_domain = mit.edu
+            }
+            MEDIA-LAB.MIT.EDU = {
+                kdc = kerberos.media.mit.edu
+                admin_server = kerberos.media.mit.edu
+            }
+            ZONE.MIT.EDU = {
+                kdc = casio.mit.edu
+                kdc = seiko.mit.edu
+                admin_server = casio.mit.edu
+            }
+            MOOF.MIT.EDU = {
+                kdc = three-headed-dogcow.mit.edu:88
+                kdc = three-headed-dogcow-1.mit.edu:88
+                admin_server = three-headed-dogcow.mit.edu
+            }
+            CSAIL.MIT.EDU = {
+                kdc = kerberos-1.csail.mit.edu
+                kdc = kerberos-2.csail.mit.edu
+                admin_server = kerberos.csail.mit.edu
+                default_domain = csail.mit.edu
+                krb524_server = krb524.csail.mit.edu
+            }
+            IHTFP.ORG = {
+                kdc = kerberos.ihtfp.org
+                admin_server = kerberos.ihtfp.org
+            }
+            GNU.ORG = {
+                kdc = kerberos.gnu.org
+                kdc = kerberos-2.gnu.org
+                kdc = kerberos-3.gnu.org
+                admin_server = kerberos.gnu.org
+            }
+            1TS.ORG = {
+                kdc = kerberos.1ts.org
+                admin_server = kerberos.1ts.org
+            }
+            GRATUITOUS.ORG = {
+                kdc = kerberos.gratuitous.org
+                admin_server = kerberos.gratuitous.org
+            }
+            DOOMCOM.ORG = {
+                kdc = kerberos.doomcom.org
+                admin_server = kerberos.doomcom.org
+            }
+            ANDREW.CMU.EDU = {
+                kdc = vice28.fs.andrew.cmu.edu
+                kdc = vice2.fs.andrew.cmu.edu
+                kdc = vice11.fs.andrew.cmu.edu
+                kdc = vice12.fs.andrew.cmu.edu
+                admin_server = vice28.fs.andrew.cmu.edu
+                default_domain = andrew.cmu.edu
+            }
+            CS.CMU.EDU = {
+                kdc = kerberos.cs.cmu.edu
+                kdc = kerberos-2.srv.cs.cmu.edu
+                admin_server = kerberos.cs.cmu.edu
+            }
+            DEMENTIA.ORG = {
+                kdc = kerberos.dementia.org
+                kdc = kerberos2.dementia.org
+                admin_server = kerberos.dementia.org
+            }
+            stanford.edu = {
+                kdc = krb5auth1.stanford.edu
+                kdc = krb5auth2.stanford.edu
+                kdc = krb5auth3.stanford.edu
+                admin_server = krb5-admin.stanford.edu
+                default_domain = stanford.edu
+            }
+
+        [domain_realm]
+            .${cfg.domainRealm} = ${cfg.defaultRealm}
+            ${cfg.domainRealm} = ${cfg.defaultRealm}
+            .mit.edu = ATHENA.MIT.EDU
+            mit.edu = ATHENA.MIT.EDU
+            .exchange.mit.edu = EXCHANGE.MIT.EDU
+            exchange.mit.edu = EXCHANGE.MIT.EDU
+            .media.mit.edu = MEDIA-LAB.MIT.EDU
+            media.mit.edu = MEDIA-LAB.MIT.EDU
+            .csail.mit.edu = CSAIL.MIT.EDU
+            csail.mit.edu = CSAIL.MIT.EDU
+            .whoi.edu = ATHENA.MIT.EDU
+            whoi.edu = ATHENA.MIT.EDU
+            .stanford.edu = stanford.edu
+
+        [logging]
+            kdc = SYSLOG:INFO:DAEMON
+            admin_server = SYSLOG:INFO:DAEMON
+            default = SYSLOG:INFO:DAEMON
+            krb4_convert = true
+            krb4_get_tickets = false
+
+        [appdefaults]
+            pam = {
+                debug = false
+                ticket_lifetime = 36000
+                renew_lifetime = 36000
+                max_timeout = 30
+                timeout_shift = 2
+                initial_timeout = 1
+            }
+      '';
+
+  };
+
+}

nixos/modules/config/krb5/default.nix

@@ -1,367 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-let
-
-  cfg = config.krb5;
-
-  # This is to provide support for old configuration options (as much as is
-  # reasonable). This can be removed after 18.03 was released.
-  defaultConfig = {
-    libdefaults = optionalAttrs (cfg.defaultRealm != null)
-      { default_realm = cfg.defaultRealm; };
-
-    realms = optionalAttrs (lib.all (value: value != null) [
-      cfg.defaultRealm cfg.kdc cfg.kerberosAdminServer
-    ]) {
-      "${cfg.defaultRealm}" = {
-        kdc = cfg.kdc;
-        admin_server = cfg.kerberosAdminServer;
-      };
-    };
-
-    domain_realm = optionalAttrs (lib.all (value: value != null) [
-      cfg.domainRealm cfg.defaultRealm
-    ]) {
-      ".${cfg.domainRealm}" = cfg.defaultRealm;
-      "${cfg.domainRealm}" = cfg.defaultRealm;
-    };
-  };
-
-  mergedConfig = (recursiveUpdate defaultConfig {
-    inherit (config.krb5)
-      kerberos libdefaults realms domain_realm capaths appdefaults plugins
-      extraConfig config;
-  });
-
-  filterEmbeddedMetadata = value: if isAttrs value then
-    (filterAttrs
-      (attrName: attrValue: attrName != "_module" && attrValue != null)
-        value)
-    else value;
-
-  mkIndent = depth: concatStrings (builtins.genList (_:  " ") (2 * depth));
-
-  mkRelation = name: value: "${name} = ${mkVal { inherit value; }}";
-
-  mkVal = { value, depth ? 0 }:
-    if (value == true) then "true"
-    else if (value == false) then "false"
-    else if (isInt value) then (toString value)
-    else if (isList value) then
-      concatMapStringsSep " " mkVal { inherit value depth; }
-    else if (isAttrs value) then
-      (concatStringsSep "\n${mkIndent (depth + 1)}"
-        ([ "{" ] ++ (mapAttrsToList
-          (attrName: attrValue: let
-            mappedAttrValue = mkVal {
-              value = attrValue;
-              depth = depth + 1;
-            };
-          in "${attrName} = ${mappedAttrValue}")
-        value))) + "\n${mkIndent depth}}"
-    else value;
-
-  mkMappedAttrsOrString = value: concatMapStringsSep "\n"
-    (line: if builtins.stringLength line > 0
-      then "${mkIndent 1}${line}"
-      else line)
-    (splitString "\n"
-      (if isAttrs value then
-        concatStringsSep "\n"
-            (mapAttrsToList mkRelation value)
-        else value));
-
-in {
-
-  ###### interface
-
-  options = {
-    krb5 = {
-      enable = mkEnableOption "Whether to enable Kerberos V.";
-
-      kerberos = mkOption {
-        type = types.package;
-        default = pkgs.krb5Full;
-        defaultText = "pkgs.krb5Full";
-        example = literalExample "pkgs.heimdalFull";
-        description = ''
-          The Kerberos implementation that will be present in
-          <literal>environment.systemPackages</literal> after enabling this
-          service.
-        '';
-      };
-
-      libdefaults = mkOption {
-        type = with types; either attrs lines;
-        default = {};
-        apply = attrs: filterEmbeddedMetadata attrs;
-        example = literalExample ''
-          {
-            default_realm = "ATHENA.MIT.EDU";
-          };
-        '';
-        description = ''
-          Settings used by the Kerberos V5 library.
-        '';
-      };
-
-      realms = mkOption {
-        type = with types; either attrs lines;
-        default = {};
-        example = literalExample ''
-          {
-            "ATHENA.MIT.EDU" = {
-              admin_server = "athena.mit.edu";
-              kdc = "athena.mit.edu";
-            };
-          };
-        '';
-        apply = attrs: filterEmbeddedMetadata attrs;
-        description = "Realm-specific contact information and settings.";
-      };
-
-      domain_realm = mkOption {
-        type = with types; either attrs lines;
-        default = {};
-        example = literalExample ''
-          {
-            "example.com" = "EXAMPLE.COM";
-            ".example.com" = "EXAMPLE.COM";
-          };
-        '';
-        apply = attrs: filterEmbeddedMetadata attrs;
-        description = ''
-          Map of server hostnames to Kerberos realms.
-        '';
-      };
-
-      capaths = mkOption {
-        type = with types; either attrs lines;
-        default = {};
-        example = literalExample ''
-          {
-            "ATHENA.MIT.EDU" = {
-              "EXAMPLE.COM" = ".";
-            };
-            "EXAMPLE.COM" = {
-              "ATHENA.MIT.EDU" = ".";
-            };
-          };
-        '';
-        apply = attrs: filterEmbeddedMetadata attrs;
-        description = ''
-          Authentication paths for non-hierarchical cross-realm authentication.
-        '';
-      };
-
-      appdefaults = mkOption {
-        type = with types; either attrs lines;
-        default = {};
-        example = literalExample ''
-          {
-            pam = {
-              debug = false;
-              ticket_lifetime = 36000;
-              renew_lifetime = 36000;
-              max_timeout = 30;
-              timeout_shift = 2;
-              initial_timeout = 1;
-            };
-          };
-        '';
-        apply = attrs: filterEmbeddedMetadata attrs;
-        description = ''
-          Settings used by some Kerberos V5 applications.
-        '';
-      };
-
-      plugins = mkOption {
-        type = with types; either attrs lines;
-        default = {};
-        example = literalExample ''
-          {
-            ccselect = {
-              disable = "k5identity";
-            };
-          };
-        '';
-        apply = attrs: filterEmbeddedMetadata attrs;
-        description = ''
-          Controls plugin module registration.
-        '';
-      };
-
-      extraConfig = mkOption {
-        type = with types; nullOr lines;
-        default = null;
-        example = ''
-          [logging]
-            kdc          = SYSLOG:NOTICE
-            admin_server = SYSLOG:NOTICE
-            default      = SYSLOG:NOTICE
-        '';
-        description = ''
-          These lines go to the end of <literal>krb5.conf</literal> verbatim.
-          <literal>krb5.conf</literal> may include any of the relations that are
-          valid for <literal>kdc.conf</literal> (see <literal>man
-          kdc.conf</literal>), but it is not a recommended practice.
-        '';
-      };
-
-      config = mkOption {
-        type = with types; nullOr lines;
-        default = null;
-        example = ''
-          [libdefaults]
-            default_realm = EXAMPLE.COM
-
-          [realms]
-            EXAMPLE.COM = {
-              admin_server = kerberos.example.com
-              kdc = kerberos.example.com
-              default_principal_flags = +preauth
-            }
-
-          [domain_realm]
-            example.com  = EXAMPLE.COM
-            .example.com = EXAMPLE.COM
-
-          [logging]
-            kdc          = SYSLOG:NOTICE
-            admin_server = SYSLOG:NOTICE
-            default      = SYSLOG:NOTICE
-        '';
-        description = ''
-          Verbatim <literal>krb5.conf</literal> configuration.  Note that this
-          is mutually exclusive with configuration via
-          <literal>libdefaults</literal>, <literal>realms</literal>,
-          <literal>domain_realm</literal>, <literal>capaths</literal>,
-          <literal>appdefaults</literal>, <literal>plugins</literal> and
-          <literal>extraConfig</literal> configuration options.  Consult
-          <literal>man krb5.conf</literal> for documentation.
-        '';
-      };
-
-      defaultRealm = mkOption {
-        type = with types; nullOr str;
-        default = null;
-        example = "ATHENA.MIT.EDU";
-        description = ''
-          DEPRECATED, please use
-          <literal>krb5.libdefaults.default_realm</literal>.
-        '';
-      };
-
-      domainRealm = mkOption {
-        type = with types; nullOr str;
-        default = null;
-        example = "athena.mit.edu";
-        description = ''
-          DEPRECATED, please create a map of server hostnames to Kerberos realms
-          in <literal>krb5.domain_realm</literal>.
-        '';
-      };
-
-      kdc = mkOption {
-        type = with types; nullOr str;
-        default = null;
-        example = "kerberos.mit.edu";
-        description = ''
-          DEPRECATED, please pass a <literal>kdc</literal> attribute to a realm
-          in <literal>krb5.realms</literal>.
-        '';
-      };
-
-      kerberosAdminServer = mkOption {
-        type = with types; nullOr str;
-        default = null;
-        example = "kerberos.mit.edu";
-        description = ''
-          DEPRECATED, please pass an <literal>admin_server</literal> attribute
-          to a realm in <literal>krb5.realms</literal>.
-        '';
-      };
-    };
-  };
-
-  ###### implementation
-
-  config = mkIf cfg.enable {
-
-    environment.systemPackages = [ cfg.kerberos ];
-
-    environment.etc."krb5.conf".text = if isString cfg.config
-      then cfg.config
-      else (''
-        [libdefaults]
-        ${mkMappedAttrsOrString mergedConfig.libdefaults}
-
-        [realms]
-        ${mkMappedAttrsOrString mergedConfig.realms}
-
-        [domain_realm]
-        ${mkMappedAttrsOrString mergedConfig.domain_realm}
-
-        [capaths]
-        ${mkMappedAttrsOrString mergedConfig.capaths}
-
-        [appdefaults]
-        ${mkMappedAttrsOrString mergedConfig.appdefaults}
-
-        [plugins]
-        ${mkMappedAttrsOrString mergedConfig.plugins}
-      '' + optionalString (mergedConfig.extraConfig != null)
-          ("\n" + mergedConfig.extraConfig));
-
-    warnings = flatten [
-      (optional (cfg.defaultRealm != null) ''
-        The option krb5.defaultRealm is deprecated, please use
-        krb5.libdefaults.default_realm.
-      '')
-      (optional (cfg.domainRealm != null) ''
-        The option krb5.domainRealm is deprecated, please use krb5.domain_realm.
-      '')
-      (optional (cfg.kdc != null) ''
-        The option krb5.kdc is deprecated, please pass a kdc attribute to a
-        realm in krb5.realms.
-      '')
-      (optional (cfg.kerberosAdminServer != null) ''
-        The option krb5.kerberosAdminServer is deprecated, please pass an
-        admin_server attribute to a realm in krb5.realms.
-      '')
-    ];
-
-    assertions = [
-      { assertion = !((builtins.any (value: value != null) [
-            cfg.defaultRealm cfg.domainRealm cfg.kdc cfg.kerberosAdminServer
-          ]) && ((builtins.any (value: value != {}) [
-              cfg.libdefaults cfg.realms cfg.domain_realm cfg.capaths
-              cfg.appdefaults cfg.plugins
-            ]) || (builtins.any (value: value != null) [
-              cfg.config cfg.extraConfig
-            ])));
-        message = ''
-          Configuration of krb5.conf by deprecated options is mutually exclusive
-          with configuration by section.  Please migrate your config using the
-          attributes suggested in the warnings.
-        '';
-      }
-      { assertion = !(cfg.config != null
-          && ((builtins.any (value: value != {}) [
-              cfg.libdefaults cfg.realms cfg.domain_realm cfg.capaths
-              cfg.appdefaults cfg.plugins
-            ]) || (builtins.any (value: value != null) [
-              cfg.extraConfig cfg.defaultRealm cfg.domainRealm cfg.kdc
-              cfg.kerberosAdminServer
-            ])));
-        message = ''
-          Configuration of krb5.conf using krb.config is mutually exclusive with
-          configuration by section.  If you want to mix the two, you can pass
-          lines to any configuration section or lines to krb5.extraConfig.
-        '';
-      }
-    ];
-  };
-}

nixos/modules/misc/version.nix

@@ -78,7 +78,7 @@ in
     defaultChannel = mkOption {
       internal = true;
       type = types.str;
-      default = https://nixos.org/channels/nixos-unstable;
+      default = https://nixos.org/channels/nixos-17.09;
       description = "Default NixOS channel to which the root user is subscribed.";
     };
 
@@ -95,7 +95,7 @@ in
       nixosVersionSuffix = mkIf (pathIsDirectory gitRepo) (mkDefault (".git." + gitCommitId));
 
       # Note: code names must only increase in alphabetical order.
-      nixosCodeName = "Impala";
+      nixosCodeName = "Hummingbird";
     };
 
     # Generate /etc/os-release.  See

nixos/modules/module-list.nix

@@ -9,7 +9,7 @@
   ./config/fonts/ghostscript.nix
   ./config/gnu.nix
   ./config/i18n.nix
-  ./config/krb5/default.nix
+  ./config/krb5.nix
   ./config/ldap.nix
   ./config/networking.nix
   ./config/no-x-libs.nix
@@ -93,7 +93,6 @@
   ./programs/mosh.nix
   ./programs/mtr.nix
   ./programs/nano.nix
-  ./programs/npm.nix
   ./programs/oblogout.nix
   ./programs/qt5ct.nix
   ./programs/screen.nix
@@ -231,7 +230,6 @@
   ./services/hardware/brltty.nix
   ./services/hardware/freefall.nix
   ./services/hardware/illum.nix
-  ./services/hardware/interception-tools.nix
   ./services/hardware/irqbalance.nix
   ./services/hardware/nvidia-optimus.nix
   ./services/hardware/pcscd.nix
@@ -269,7 +267,6 @@
   ./services/mail/offlineimap.nix
   ./services/mail/opendkim.nix
   ./services/mail/opensmtpd.nix
-  ./services/mail/pfix-srsd.nix
   ./services/mail/postfix.nix
   ./services/mail/postsrsd.nix
   ./services/mail/postgrey.nix
@@ -312,7 +309,6 @@
   #./services/misc/ihaskell.nix
   ./services/misc/irkerd.nix
   ./services/misc/jackett.nix
-  ./services/misc/logkeys.nix
   ./services/misc/leaps.nix
   ./services/misc/mantisbt.nix
   ./services/misc/mathics.nix
@@ -358,7 +354,6 @@
   ./services/monitoring/collectd.nix
   ./services/monitoring/das_watchdog.nix
   ./services/monitoring/dd-agent/dd-agent.nix
-  ./services/monitoring/fusion-inventory.nix
   ./services/monitoring/grafana.nix
   ./services/monitoring/graphite.nix
   ./services/monitoring/hdaps.nix
@@ -622,7 +617,6 @@
   ./services/web-servers/phpfpm/default.nix
   ./services/web-servers/shellinabox.nix
   ./services/web-servers/tomcat.nix
-  ./services/web-servers/traefik.nix
   ./services/web-servers/uwsgi.nix
   ./services/web-servers/varnish/default.nix
   ./services/web-servers/winstone.nix

nixos/modules/programs/npm.nix

@@ -1,44 +0,0 @@
-{ config, lib, ... }:
-
-with lib;
-
-let
-  cfg = config.programs.npm;
-in
-
-{
-  ###### interface
-
-  options = {
-    programs.npm = {
-      enable = mkEnableOption "<command>npm</command> global config";
-
-      npmrc = lib.mkOption {
-        type = lib.types.lines;
-        description = ''
-          The system-wide npm configuration.
-          See <link xlink:href="https://docs.npmjs.com/misc/config"/>.
-        '';
-        default = ''
-          prefix = ''${HOME}/.npm
-        '';
-        example = ''
-          prefix = ''${HOME}/.npm
-          https-proxy=proxy.example.com
-          init-license=MIT
-          init-author-url=http://npmjs.org
-          color=true
-        '';
-      };
-    };
-  };
-
-  ###### implementation
-
-  config = lib.mkIf cfg.enable {
-    environment.etc."npmrc".text = cfg.npmrc;
-
-    environment.variables.NPM_CONFIG_GLOBALCONFIG = "/etc/npmrc";
-  };
-
-}

nixos/modules/security/pam_usb.nix

@@ -22,7 +22,7 @@ in
         description = ''
           Enable USB login for all login systems that support it.  For
           more information, visit <link
-          xlink:href="https://github.com/aluzzardi/pam_usb/wiki/Getting-Started#setting-up-devices-and-users" />.
+          xlink:href="http://pamusb.org/doc/quickstart#setting_up" />.
         '';
       };
 

nixos/modules/services/hardware/interception-tools.nix

@@ -1,61 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-let
-  cfg = config.services.interception-tools;
-in {
-  options.services.interception-tools = {
-    enable = mkOption {
-      type = types.bool;
-      default = false;
-      description = "Whether to enable the interception tools service.";
-    };
-
-    plugins = mkOption {
-      type = types.listOf types.package;
-      default = [ pkgs.interception-tools-plugins.caps2esc ];
-      description = ''
-        A list of interception tools plugins that will be made available to use
-        inside the udevmon configuration.
-      '';
-    };
-
-    udevmonConfig = mkOption {
-      type = types.either types.str types.path;
-      default = ''
-        - JOB: "intercept -g $DEVNODE | caps2esc | uinput -d $DEVNODE"
-          DEVICE:
-            EVENTS:
-              EV_KEY: [KEY_CAPSLOCK, KEY_ESC]
-      '';
-      example = ''
-        - JOB: "intercept -g $DEVNODE | y2z | x2y | uinput -d $DEVNODE"
-          DEVICE:
-            EVENTS:
-              EV_KEY: [KEY_X, KEY_Y]
-      '';
-      description = ''
-        String of udevmon YAML configuration, or path to a udevmon YAML
-        configuration file.
-      '';
-    };
-  };
-
-  config = mkIf cfg.enable {
-    systemd.services.interception-tools = {
-      description = "Interception tools";
-      path = [ pkgs.bash pkgs.interception-tools ] ++ cfg.plugins;
-      serviceConfig = {
-        ExecStart = ''
-          ${pkgs.interception-tools}/bin/udevmon -c \
-          ${if builtins.typeOf cfg.udevmonConfig == "path"
-          then cfg.udevmonConfig
-          else pkgs.writeText "udevmon.yaml" cfg.udevmonConfig}
-        '';
-        Nice = -20;
-      };
-      wantedBy = [ "multi-user.target" ];
-    };
-  };
-}

nixos/modules/services/mail/pfix-srsd.nix

@@ -1,56 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-{
-
-  ###### interface
-
-  options = {
-
-    services.pfix-srsd = {
-      enable = mkOption {
-        default = false;
-        type = types.bool;
-        description = "Whether to run the postfix sender rewriting scheme daemon.";
-      };
-
-      domain = mkOption {
-        description = "The domain for which to enable srs";
-        type = types.str;
-        example = "example.com";
-      };
-
-      secretsFile = mkOption {
-        description = ''
-          The secret data used to encode the SRS address.
-          to generate, use a command like:
-          <literal>for n in $(seq 5); do dd if=/dev/urandom count=1 bs=1024 status=none | sha256sum | sed 's/  -$//' | sed 's/^/          /'; done</literal>
-        '';
-        type = types.path;
-        default = "/var/lib/pfix-srsd/secrets";
-      };
-    };
-  };
-
-  ###### implementation
-
-  config = mkIf config.services.pfix-srsd.enable {
-    environment = {
-      systemPackages = [ pkgs.pfixtools ];
-    };
-
-    systemd.services."pfix-srsd" = {
-      description = "Postfix sender rewriting scheme daemon";
-      before = [ "postfix.service" ];
-      #note that we use requires rather than wants because postfix
-      #is unable to process (almost) all mail without srsd
-      requiredBy = [ "postfix.service" ];
-      serviceConfig = {
-        Type = "forking";
-        PIDFile = "/var/run/pfix-srsd.pid";
-        ExecStart = "${pkgs.pfixtools}/bin/pfix-srsd -p /var/run/pfix-srsd.pid -I ${config.services.pfix-srsd.domain} ${config.services.pfix-srsd.secretsFile}";
-      };
-    };
-  };
-}

nixos/modules/services/mail/postfix.nix

@@ -79,12 +79,6 @@ let
   // optionalAttrs haveTransport { transport_maps = "hash:/etc/postfix/transport"; }
   // optionalAttrs haveVirtual { virtual_alias_maps = "${cfg.virtualMapType}:/etc/postfix/virtual"; }
   // optionalAttrs (cfg.dnsBlacklists != []) { smtpd_client_restrictions = clientRestrictions; }
-  // optionalAttrs cfg.useSrs {
-    sender_canonical_maps = "tcp:127.0.0.1:10001";
-    sender_canonical_classes = "envelope_sender";
-    recipient_canonical_maps = "tcp:127.0.0.1:10002";
-    recipient_canonical_classes= "envelope_recipient";
-  }
   // optionalAttrs cfg.enableHeaderChecks { header_checks = "regexp:/etc/postfix/header_checks"; }
   // optionalAttrs (cfg.sslCert != "") {
     smtp_tls_CAfile = cfg.sslCACert;
@@ -632,12 +626,6 @@ in
         description = "Maps to be compiled and placed into /var/lib/postfix/conf.";
       };
 
-      useSrs = mkOption {
-        type = types.bool;
-        default = false;
-        description = "Whether to enable sender rewriting scheme";
-      };
-
     };
 
   };
@@ -658,8 +646,6 @@ in
         systemPackages = [ pkgs.postfix ];
       };
 
-      services.pfix-srsd.enable = config.services.postfix.useSrs;
-
       services.mail.sendmailSetuidWrapper = mkIf config.services.postfix.setSendmail {
         program = "sendmail";
         source = "${pkgs.postfix}/bin/sendmail";

nixos/modules/services/misc/gogs.nix

@@ -25,7 +25,6 @@ let
     HTTP_ADDR = ${cfg.httpAddress}
     HTTP_PORT = ${toString cfg.httpPort}
     ROOT_URL = ${cfg.rootUrl}
-    STATIC_ROOT_PATH = ${cfg.staticRootPath}
 
     [session]
     COOKIE_NAME = session
@@ -176,13 +175,6 @@ in
         '';
       };
 
-      staticRootPath = mkOption {
-        type = types.str;
-        default = "${pkgs.gogs.data}";
-        example = "/var/lib/gogs/data";
-        description = "Upper level of template and static files path.";
-      };
-
       extraConfig = mkOption {
         type = types.str;
         default = "";
@@ -203,8 +195,6 @@ in
         runConfig = "${cfg.stateDir}/custom/conf/app.ini";
         secretKey = "${cfg.stateDir}/custom/conf/secret_key";
       in ''
-        mkdir -p ${cfg.stateDir}
-
         # copy custom configuration and generate a random secret key if needed
         ${optionalString (cfg.useWizard == false) ''
           mkdir -p ${cfg.stateDir}/custom/conf
@@ -250,7 +240,7 @@ in
       };
     };
 
-    users = mkIf (cfg.user == "gogs") {
+    users = {
       extraUsers.gogs = {
         description = "Go Git Service";
         uid = config.ids.uids.gogs;

nixos/modules/services/misc/logkeys.nix

@@ -1,23 +0,0 @@
-{ config, lib, ... }:
-
-with lib;
-
-let
-  cfg = config.services.logkeys;
-in {
-  options.services.logkeys = {
-    enable = mkEnableOption "logkeys service";
-  };
-
-  config = mkIf cfg.enable {
-    systemd.services.logkeys = {
-      description = "LogKeys Keylogger Daemon";
-      wantedBy = [ "multi-user.target" ];
-      serviceConfig = {
-        ExecStart = "${pkgs.logkeys}/bin/logkeys -s";
-        ExecStop = "${pkgs.logkeys}/bin/logkeys -k";
-        Type = "forking";
-      };
-    };
-  };
-}

nixos/modules/services/monitoring/fusion-inventory.nix

@@ -1,66 +0,0 @@
-# Fusion Inventory daemon.
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-let
-  cfg = config.services.fusionInventory;
-
-  configFile = pkgs.writeText "fusion_inventory.conf" ''
-    server = ${concatStringsSep ", " cfg.servers}
-
-    logger = stderr
-
-    ${cfg.extraConfig}
-  '';
-
-in {
-
-  ###### interface
-
-  options = {
-
-    services.fusionInventory = {
-
-      enable = mkEnableOption "Fusion Inventory Agent";
-
-      servers = mkOption {
-        type = types.listOf types.str;
-        description = ''
-          The urls of the OCS/GLPI servers to connect to.
-        '';
-      };
-
-      extraConfig = mkOption {
-        default = "";
-        type = types.lines;
-        description = ''
-          Configuration that is injected verbatim into the configuration file.
-        '';
-      };
-    };
-  };
-
-
-  ###### implementation
-
-  config = mkIf cfg.enable {
-
-    users.extraUsers = singleton {
-      name = "fusion-inventory";
-      description = "FusionInventory user";
-    };
-
-    systemd.services."fusion-inventory" = {
-      description = "Fusion Inventory Agent";
-      wantedBy = [ "multi-user.target" ];
-
-      environment = {
-        OPTIONS = "--no-category=software";
-      };
-      serviceConfig = {
-        ExecStart = "${pkgs.fusionInventory}/bin/fusioninventory-agent --conf-file=${configFile} --daemon --no-fork";
-      };
-    };
-  };
-}

nixos/modules/services/network-filesystems/ipfs.nix

@@ -7,7 +7,7 @@ let
 
   ipfsFlags = toString ([
     (optionalString  cfg.autoMount                   "--mount")
-    #(optionalString  cfg.autoMigrate                 "--migrate")
+    (optionalString  cfg.autoMigrate                 "--migrate")
     (optionalString  cfg.enableGC                    "--enable-gc")
     (optionalString (cfg.serviceFdlimit != null)     "--manage-fdlimit=false")
     (optionalString (cfg.defaultMode == "offline")   "--offline")
@@ -36,7 +36,6 @@ let
 
   baseService = recursiveUpdate commonEnv {
     wants = [ "ipfs-init.service" ];
-    # NB: migration must be performed prior to pre-start, else we get the failure message!
     preStart = ''
       ipfs repo fsck # workaround for BUG #4212 (https://github.com/ipfs/go-ipfs/issues/4214)
       ipfs --local config Addresses.API ${cfg.apiAddress}
@@ -98,17 +97,11 @@ in {
         description = "systemd service that is enabled by default";
       };
 
-      /*
       autoMigrate = mkOption {
         type = types.bool;
         default = false;
-        description = ''
-          Whether IPFS should try to migrate the file system automatically.
-
-          The daemon will need to be able to download a binary from https://ipfs.io to perform the migration.
-        '';
+        description = "Whether IPFS should try to migrate the file system automatically";
       };
-      */
 
       autoMount = mkOption {
         type = types.bool;

nixos/modules/services/networking/softether.nix

@@ -3,6 +3,7 @@
 with lib;
 
 let
+  pkg = pkgs.softether;
   cfg = config.services.softether;
 
 in
@@ -16,15 +17,6 @@ in
 
       enable = mkEnableOption "SoftEther VPN services";
 
-      package = mkOption {
-        type = types.package;
-        default = pkgs.softether;
-        defaultText = "pkgs.softether";
-        description = ''
-          softether derivation to use.
-        '';
-      };
-
       vpnserver.enable = mkEnableOption "SoftEther VPN Server";
 
       vpnbridge.enable = mkEnableOption "SoftEther VPN Bridge";
@@ -49,7 +41,7 @@ in
 
       dataDir = mkOption {
         type = types.string;
-        default = "${cfg.package.dataDir}";
+        default = "${pkg.dataDir}";
         description = ''
           Data directory for SoftEther VPN.
         '';
@@ -65,13 +57,12 @@ in
 
     mkMerge [{
       environment.systemPackages = [
-          (pkgs.lib.overrideDerivation cfg.package (attrs: {
+          (pkgs.lib.overrideDerivation pkg (attrs: {
             dataDir = cfg.dataDir;
           }))
         ];
       systemd.services."softether-init" = {
         description = "SoftEther VPN services initial task";
-        wantedBy = [ "network.target" ];
         serviceConfig = {
           Type = "oneshot";
           RemainAfterExit = false;
@@ -80,11 +71,11 @@ in
             for d in vpnserver vpnbridge vpnclient vpncmd; do
                 if ! test -e ${cfg.dataDir}/$d; then
                     ${pkgs.coreutils}/bin/mkdir -m0700 -p ${cfg.dataDir}/$d
-                    install -m0600 ${cfg.package}${cfg.dataDir}/$d/hamcore.se2 ${cfg.dataDir}/$d/hamcore.se2
+                    install -m0600 ${pkg}${cfg.dataDir}/$d/hamcore.se2 ${cfg.dataDir}/$d/hamcore.se2
                 fi
             done
             rm -rf ${cfg.dataDir}/vpncmd/vpncmd
-            ln -s ${cfg.package}${cfg.dataDir}/vpncmd/vpncmd ${cfg.dataDir}/vpncmd/vpncmd
+            ln -s ${pkg}${cfg.dataDir}/vpncmd/vpncmd ${cfg.dataDir}/vpncmd/vpncmd
         '';
       };
     }
@@ -92,17 +83,17 @@ in
     (mkIf (cfg.vpnserver.enable) {
       systemd.services.vpnserver = {
         description = "SoftEther VPN Server";
-        after = [ "softether-init.service" ];
-        requires = [ "softether-init.service" ];
-        wantedBy = [ "network.target" ];
+        after = [ "softether-init.service" "network.target" ];
+        wants = [ "softether-init.service" ];
+        wantedBy = [ "multi-user.target" ];
         serviceConfig = {
           Type = "forking";
-          ExecStart = "${cfg.package}/bin/vpnserver start";
-          ExecStop = "${cfg.package}/bin/vpnserver stop";
+          ExecStart = "${pkg}/bin/vpnserver start";
+          ExecStop = "${pkg}/bin/vpnserver stop";
         };
         preStart = ''
             rm -rf ${cfg.dataDir}/vpnserver/vpnserver
-            ln -s ${cfg.package}${cfg.dataDir}/vpnserver/vpnserver ${cfg.dataDir}/vpnserver/vpnserver
+            ln -s ${pkg}${cfg.dataDir}/vpnserver/vpnserver ${cfg.dataDir}/vpnserver/vpnserver
         '';
         postStop = ''
             rm -rf ${cfg.dataDir}/vpnserver/vpnserver
@@ -113,17 +104,17 @@ in
     (mkIf (cfg.vpnbridge.enable) {
       systemd.services.vpnbridge = {
         description = "SoftEther VPN Bridge";
-        after = [ "softether-init.service" ];
-        requires = [ "softether-init.service" ];
-        wantedBy = [ "network.target" ];
+        after = [ "softether-init.service" "network.target" ];
+        wants = [ "softether-init.service" ];
+        wantedBy = [ "multi-user.target" ];
         serviceConfig = {
           Type = "forking";
-          ExecStart = "${cfg.package}/bin/vpnbridge start";
-          ExecStop = "${cfg.package}/bin/vpnbridge stop";
+          ExecStart = "${pkg}/bin/vpnbridge start";
+          ExecStop = "${pkg}/bin/vpnbridge stop";
         };
         preStart = ''
             rm -rf ${cfg.dataDir}/vpnbridge/vpnbridge
-            ln -s ${cfg.package}${cfg.dataDir}/vpnbridge/vpnbridge ${cfg.dataDir}/vpnbridge/vpnbridge
+            ln -s ${pkg}${cfg.dataDir}/vpnbridge/vpnbridge ${cfg.dataDir}/vpnbridge/vpnbridge
         '';
         postStop = ''
             rm -rf ${cfg.dataDir}/vpnbridge/vpnbridge
@@ -134,17 +125,17 @@ in
     (mkIf (cfg.vpnclient.enable) {
       systemd.services.vpnclient = {
         description = "SoftEther VPN Client";
-        after = [ "softether-init.service" ];
-        requires = [ "softether-init.service" ];
-        wantedBy = [ "network.target" ];
+        after = [ "softether-init.service" "network.target" ];
+        wants = [ "softether-init.service" ];
+        wantedBy = [ "multi-user.target" ];
         serviceConfig = {
           Type = "forking";
-          ExecStart = "${cfg.package}/bin/vpnclient start";
-          ExecStop = "${cfg.package}/bin/vpnclient stop";
+          ExecStart = "${pkg}/bin/vpnclient start";
+          ExecStop = "${pkg}/bin/vpnclient stop";
         };
         preStart = ''
             rm -rf ${cfg.dataDir}/vpnclient/vpnclient
-            ln -s ${cfg.package}${cfg.dataDir}/vpnclient/vpnclient ${cfg.dataDir}/vpnclient/vpnclient
+            ln -s ${pkg}${cfg.dataDir}/vpnclient/vpnclient ${cfg.dataDir}/vpnclient/vpnclient
         '';
         postStart = ''
             sleep 1

nixos/modules/services/networking/wireguard.nix

@@ -95,14 +95,6 @@ let
         type = with types; listOf (submodule peerOpts);
       };
 
-      allowedIPsAsRoutes = mkOption {
-        example = false;
-        default = true;
-        type = types.bool;
-        description = ''
-          Determines whether to add allowed IPs as routes or not.
-        '';
-      };
     };
 
   };
@@ -225,11 +217,11 @@ let
 
             "${ipCommand} link set up dev ${name}"
 
-            (optionals (values.allowedIPsAsRoutes != false) (map (peer:
+            (map (peer:
             (map (allowedIP:
             "${ipCommand} route replace ${allowedIP} dev ${name} table ${values.table}"
             ) peer.allowedIPs)
-            ) values.peers))
+            ) values.peers)
 
             values.postSetup
           ]);

nixos/modules/services/web-servers/traefik.nix

@@ -1,115 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-let
-  cfg = config.services.traefik;
-  configFile =
-    if cfg.configFile == null then
-      pkgs.runCommand "config.toml" {
-        buildInputs = [ pkgs.remarshal ];
-      } ''
-        remarshal -if json -of toml \
-          < ${pkgs.writeText "config.json" (builtins.toJSON cfg.configOptions)} \
-          > $out
-      ''
-    else cfg.configFile;
-
-in {
-  options.services.traefik = {
-    enable = mkEnableOption "Traefik web server";
-
-    configFile = mkOption {
-      default = null;
-      example = literalExample "/path/to/config.toml";
-      type = types.nullOr types.path;
-      description = ''
-        Path to verbatim traefik.toml to use.
-        (Using that option has precedence over <literal>configOptions</literal>)
-      '';
-    };
-
-    configOptions = mkOption {
-      description = ''
-        Config for Traefik.
-      '';
-      type = types.attrs;
-      default = {
-        defaultEntryPoints = ["http"];
-        entryPoints.http.address = ":80";
-      };
-      example = {
-        defaultEntrypoints = [ "http" ];
-        web.address = ":8080";
-        entryPoints.http.address = ":80";
-
-        file = {};
-        frontends = {
-          frontend1 = {
-            backend = "backend1";
-            routes.test_1.rule = "Host:localhost";
-          };
-        };
-        backends.backend1 = {
-          servers.server1.url = "http://localhost:8000";
-        };
-      };
-    };
-
-    dataDir = mkOption {
-      default = "/var/lib/traefik";
-      type = types.path;
-      description = ''
-      Location for any persistent data traefik creates, ie. acme
-      '';
-    };
-
-    package = mkOption {
-      default = pkgs.traefik;
-      defaultText = "pkgs.traefik";
-      type = types.package;
-      description = "Traefik package to use.";
-    };
-  };
-
-  config = mkIf cfg.enable {
-    systemd.services.traefik = {
-      description = "Traefik web server";
-      after = [ "network-online.target" ];
-      wantedBy = [ "multi-user.target" ];
-      serviceConfig = {
-        PermissionsStartOnly = true;
-        ExecStart = ''${cfg.package.bin}/bin/traefik --configfile=${configFile}'';
-        ExecStartPre = [
-          ''${pkgs.coreutils}/bin/mkdir -p "${cfg.dataDir}"''
-          ''${pkgs.coreutils}/bin/chmod 700 "${cfg.dataDir}"''
-          ''${pkgs.coreutils}/bin/chown -R traefik:traefik "${cfg.dataDir}"''
-        ];
-        Type = "simple";
-        User = "traefik";
-        Group = "traefik";
-        Restart = "on-failure";
-        StartLimitInterval = 86400;
-        StartLimitBurst = 5;
-        AmbientCapabilities = "cap_net_bind_service";
-        CapabilityBoundingSet = "cap_net_bind_service";
-        NoNewPrivileges = true;
-        LimitNPROC = 64;
-        LimitNOFILE = 1048576;
-        PrivateTmp = true;
-        PrivateDevices = true;
-        ProtectHome = true;
-        ProtectSystem = "full";
-        ReadWriteDirectories = cfg.dataDir;
-      };
-    };
-
-    users.extraUsers.traefik = {
-      group = "traefik";
-      home = cfg.dataDir;
-      createHome = true;
-    };
-
-    users.extraGroups.traefik = {};
-  };
-}

nixos/modules/services/x11/desktop-managers/default.nix

@@ -20,7 +20,6 @@ in
   imports = [
     ./none.nix ./xterm.nix ./xfce.nix ./plasma5.nix ./lumina.nix
     ./lxqt.nix ./enlightenment.nix ./gnome3.nix ./kodi.nix ./maxx.nix
-    ./mate.nix
   ];
 
   options = {

nixos/modules/services/x11/desktop-managers/mate.nix

@@ -1,79 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-let
-
-  # Remove packages of ys from xs, based on their names
-  removePackagesByName = xs: ys:
-    let
-      pkgName = drv: (builtins.parseDrvName drv.name).name;
-      ysNames = map pkgName ys;
-    in
-      filter (x: !(builtins.elem (pkgName x) ysNames)) xs;
-
-  xcfg = config.services.xserver;
-  cfg = xcfg.desktopManager.mate;
-
-in
-
-{
-  options = {
-
-    services.xserver.desktopManager.mate.enable = mkOption {
-      type = types.bool;
-      default = false;
-      description = "Enable the MATE desktop environment";
-    };
-
-    environment.mate.excludePackages = mkOption {
-      default = [];
-      example = literalExample "[ pkgs.mate.mate-terminal pkgs.mate.pluma ]";
-      type = types.listOf types.package;
-      description = "Which MATE packages to exclude from the default environment";
-    };
-
-  };
-
-  config = mkIf (xcfg.enable && cfg.enable) {
-
-    services.xserver.desktopManager.session = singleton {
-      name = "mate";
-      bgSupport = true;
-      start = ''
-        # Set GTK_DATA_PREFIX so that GTK+ can find the themes
-        export GTK_DATA_PREFIX=${config.system.path}
-
-        # Find theme engines
-        export GTK_PATH=${config.system.path}/lib/gtk-3.0:${config.system.path}/lib/gtk-2.0
-
-        export XDG_MENU_PREFIX=mate
-
-        # Find the mouse
-        export XCURSOR_PATH=~/.icons:${config.system.path}/share/icons
-
-        # Update user dirs as described in http://freedesktop.org/wiki/Software/xdg-user-dirs/
-        ${pkgs.xdg-user-dirs}/bin/xdg-user-dirs-update
-
-        ${pkgs.mate.mate-session-manager}/bin/mate-session &
-        waitPID=$!
-      '';
-    };
-
-    environment.systemPackages =
-      pkgs.mate.basePackages ++
-      (removePackagesByName
-        pkgs.mate.extraPackages
-        config.environment.mate.excludePackages);
-
-    services.dbus.packages = [
-      pkgs.gnome3.dconf
-      pkgs.at_spi2_core
-    ];
-
-    services.gnome3.gnome-keyring.enable = true;
-
-    environment.pathsToLink = [ "/share" ];
-  };
-
-}

nixos/modules/virtualisation/grow-partition.nix

@@ -24,12 +24,7 @@ with lib;
       copy_bin_and_libs ${pkgs.gnused}/bin/sed
       copy_bin_and_libs ${pkgs.utillinux}/sbin/sfdisk
       copy_bin_and_libs ${pkgs.utillinux}/sbin/lsblk
-
-      substitute "${pkgs.cloud-utils}/bin/.growpart-wrapped" "$out/bin/growpart" \
-        --replace "${pkgs.bash}/bin/sh" "/bin/sh" \
-        --replace "awk" "gawk" \
-        --replace "sed" "gnused"
-
+      cp -v ${pkgs.cloud-utils}/bin/.growpart-wrapped $out/bin/growpart
       ln -s sed $out/bin/gnused
     '';
 

nixos/release-combined.nix

@@ -81,10 +81,7 @@ 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
-        nixos.tests.docker-edge
         (all nixos.tests.ecryptfs)
-        (all nixos.tests.env)
         (all nixos.tests.ipv6)
         (all nixos.tests.i3wm)
         (all nixos.tests.keymap.azerty)
@@ -93,7 +90,7 @@ in rec {
         (all nixos.tests.keymap.dvp)
         (all nixos.tests.keymap.neo)
         (all nixos.tests.keymap.qwertz)
-        nixos.tests.plasma5.x86_64-linux # avoid big build on i686
+        (all nixos.tests.plasma5)
         #(all nixos.tests.lightdm)
         (all nixos.tests.login)
         (all nixos.tests.misc)

nixos/release.nix

@@ -9,7 +9,7 @@ let
 
   version = fileContents ../.version;
   versionSuffix =
-    (if stableBranch then "." else "pre") + "${toString nixpkgs.revCount}.${nixpkgs.shortRev}";
+    (if stableBranch then "." else "beta") + "${toString (nixpkgs.revCount - 114283)}.${nixpkgs.shortRev}";
 
   forAllSystems = genAttrs supportedSystems;
 
@@ -214,7 +214,6 @@ in rec {
   # Run the tests for each platform.  You can run a test by doing
   # e.g. ‘nix-build -A tests.login.x86_64-linux’, or equivalently,
   # ‘nix-build tests/login.nix -A result’.
-  tests.acme = callTest tests/acme.nix {};
   tests.avahi = callTest tests/avahi.nix {};
   tests.bittorrent = callTest tests/bittorrent.nix {};
   tests.blivet = callTest tests/blivet.nix {};
@@ -222,7 +221,7 @@ in rec {
   tests.boot-stage1 = callTest tests/boot-stage1.nix {};
   tests.cadvisor = hydraJob (import tests/cadvisor.nix { system = "x86_64-linux"; });
   tests.chromium = (callSubTests tests/chromium.nix { system = "x86_64-linux"; }).stable;
-  tests.cjdns = callTest tests/cjdns.nix {};
+  tests.cjdns = callTest tests/cjdns.nix { system = "x86_64-linux"; };
   tests.cloud-init = callTest tests/cloud-init.nix {};
   tests.containers-ipv4 = callTest tests/containers-ipv4.nix {};
   tests.containers-ipv6 = callTest tests/containers-ipv6.nix {};
@@ -235,7 +234,6 @@ in rec {
   tests.containers-hosts = callTest tests/containers-hosts.nix {};
   tests.containers-macvlans = callTest tests/containers-macvlans.nix {};
   tests.docker = hydraJob (import tests/docker.nix { system = "x86_64-linux"; });
-  tests.docker-edge = hydraJob (import tests/docker-edge.nix { system = "x86_64-linux"; });
   tests.dovecot = callTest tests/dovecot.nix {};
   tests.dnscrypt-proxy = callTest tests/dnscrypt-proxy.nix { system = "x86_64-linux"; };
   tests.ecryptfs = callTest tests/ecryptfs.nix {};
@@ -243,7 +241,6 @@ in rec {
   tests.ec2-nixops = hydraJob (import tests/ec2.nix { system = "x86_64-linux"; }).boot-ec2-nixops;
   tests.ec2-config = hydraJob (import tests/ec2.nix { system = "x86_64-linux"; }).boot-ec2-config;
   tests.elk = hydraJob (import tests/elk.nix { system = "x86_64-linux"; });
-  tests.env = callTest tests/env.nix {};
   tests.ferm = callTest tests/ferm.nix {};
   tests.firefox = callTest tests/firefox.nix {};
   tests.firewall = callTest tests/firewall.nix {};
@@ -254,12 +251,10 @@ in rec {
   tests.gocd-server = callTest tests/gocd-server.nix {};
   tests.gnome3 = callTest tests/gnome3.nix {};
   tests.gnome3-gdm = callTest tests/gnome3-gdm.nix {};
-  tests.grafama = callTest tests/grafana.nix {};
   tests.hardened = callTest tests/hardened.nix { };
-  tests.hibernate = callTest tests/hibernate.nix {};
+  tests.hibernate = callTest tests/hibernate.nix { system = "x86_64-linux"; };
   tests.hound = callTest tests/hound.nix {};
   tests.i3wm = callTest tests/i3wm.nix {};
-  tests.initrd-network-ssh = callTest tests/initrd-network-ssh.nix {};
   tests.installer = callSubTests tests/installer.nix {};
   tests.influxdb = callTest tests/influxdb.nix {};
   tests.ipv6 = callTest tests/ipv6.nix {};
@@ -267,9 +262,6 @@ in rec {
   tests.plasma5 = callTest tests/plasma5.nix {};
   tests.keymap = callSubTests tests/keymap.nix {};
   tests.initrdNetwork = callTest tests/initrd-network.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.keystone = callTest tests/keystone.nix {};
   tests.kubernetes = hydraJob (import tests/kubernetes/default.nix { system = "x86_64-linux"; });
   tests.latestKernel.login = callTest tests/login.nix { latestKernel = true; };
@@ -278,7 +270,6 @@ in rec {
   tests.login = callTest tests/login.nix {};
   #tests.logstash = callTest tests/logstash.nix {};
   tests.mathics = callTest tests/mathics.nix {};
-  tests.mesos = callTest tests/mesos.nix {};
   tests.misc = callTest tests/misc.nix {};
   tests.mongodb = callTest tests/mongodb.nix {};
   tests.mumble = callTest tests/mumble.nix {};

nixos/tests/acme.nix

@@ -1,62 +0,0 @@
-let
-  commonConfig = { config, lib, pkgs, nodes, ... }: {
-    networking.nameservers = [
-      nodes.letsencrypt.config.networking.primaryIPAddress
-    ];
-
-    nixpkgs.overlays = lib.singleton (self: super: {
-      cacert = super.cacert.overrideDerivation (drv: {
-        installPhase = (drv.installPhase or "") + ''
-          cat "${nodes.letsencrypt.config.test-support.letsencrypt.caCert}" \
-            >> "$out/etc/ssl/certs/ca-bundle.crt"
-        '';
-      });
-
-      pythonPackages = (super.python.override {
-        packageOverrides = lib.const (pysuper: {
-          certifi = pysuper.certifi.overridePythonAttrs (attrs: {
-            postPatch = (attrs.postPatch or "") + ''
-              cat "${self.cacert}/etc/ssl/certs/ca-bundle.crt" \
-                > certifi/cacert.pem
-            '';
-          });
-        });
-      }).pkgs;
-    });
-  };
-
-in import ./make-test.nix {
-  name = "acme";
-
-  nodes = {
-    letsencrypt = ./common/letsencrypt.nix;
-
-    webserver = { config, pkgs, ... }: {
-      imports = [ commonConfig ];
-      networking.firewall.allowedTCPPorts = [ 80 443 ];
-
-      networking.extraHosts = ''
-        ${config.networking.primaryIPAddress} example.com
-      '';
-
-      services.nginx.enable = true;
-      services.nginx.virtualHosts."example.com" = {
-        enableACME = true;
-        forceSSL = true;
-        locations."/".root = pkgs.runCommand "docroot" {} ''
-          mkdir -p "$out"
-          echo hello world > "$out/index.html"
-        '';
-      };
-    };
-
-    client = commonConfig;
-  };
-
-  testScript = ''
-    $letsencrypt->waitForUnit("boulder.service");
-    startAll;
-    $webserver->waitForUnit("acme-certificates.target");
-    $client->succeed('curl https://example.com/ | grep -qF "hello world"');
-  '';
-}

nixos/tests/common/letsencrypt.nix

@@ -1,446 +0,0 @@
-# Fully pluggable module to have Letsencrypt's Boulder ACME service running in
-# a test environment.
-#
-# The certificate for the ACME service is exported as:
-#
-#   config.test-support.letsencrypt.caCert
-#
-# This value can be used inside the configuration of other test nodes to inject
-# the snakeoil certificate into security.pki.certificateFiles or into package
-# overlays.
-#
-# Another value that's needed if you don't use a custom resolver (see below for
-# notes on that) is to add the letsencrypt node as a nameserver to every node
-# that needs to acquire certificates using ACME, because otherwise the API host
-# for letsencrypt.org can't be resolved.
-#
-# A configuration example of a full node setup using this would be this:
-#
-# {
-#   letsencrypt = import ./common/letsencrypt.nix;
-#
-#   example = { nodes, ... }: {
-#     networking.nameservers = [
-#       nodes.letsencrypt.config.networking.primaryIPAddress
-#     ];
-#     security.pki.certificateFiles = [
-#       nodes.letsencrypt.config.test-support.letsencrypt.caCert
-#     ];
-#   };
-# }
-#
-# By default, this module runs a local resolver, generated using resolver.nix
-# from the same directory to automatically discover all zones in the network.
-#
-# If you do not want this and want to use your own resolver, you can just
-# override networking.nameservers like this:
-#
-# {
-#   letsencrypt = { nodes, ... }: {
-#     imports = [ ./common/letsencrypt.nix ];
-#     networking.nameservers = [
-#       nodes.myresolver.config.networking.primaryIPAddress
-#     ];
-#   };
-#
-#   myresolver = ...;
-# }
-#
-# Keep in mind, that currently only _one_ resolver is supported, if you have
-# more than one resolver in networking.nameservers only the first one will be
-# used.
-#
-# Also make sure that whenever you use a resolver from a different test node
-# that it has to be started _before_ the ACME service.
-{ config, pkgs, lib, ... }:
-
-let
-  softhsm = pkgs.stdenv.mkDerivation rec {
-    name = "softhsm-${version}";
-    version = "1.3.8";
-
-    src = pkgs.fetchurl {
-      url = "https://dist.opendnssec.org/source/${name}.tar.gz";
-      sha256 = "0flmnpkgp65ym7w3qyg78d3fbmvq3aznmi66rgd420n33shf7aif";
-    };
-
-    configureFlags = [ "--with-botan=${pkgs.botan}" ];
-    buildInputs = [ pkgs.sqlite ];
-  };
-
-  pkcs11-proxy = pkgs.stdenv.mkDerivation {
-    name = "pkcs11-proxy";
-
-    src = pkgs.fetchFromGitHub {
-      owner = "SUNET";
-      repo = "pkcs11-proxy";
-      rev = "944684f78bca0c8da6cabe3fa273fed3db44a890";
-      sha256 = "1nxgd29y9wmifm11pjcdpd2y293p0dgi0x5ycis55miy97n0f5zy";
-    };
-
-    postPatch = "patchShebangs mksyscalls.sh";
-
-    nativeBuildInputs = [ pkgs.cmake ];
-    buildInputs = [ pkgs.openssl pkgs.libseccomp ];
-  };
-
-  mkGoDep = { goPackagePath, url ? "https://${goPackagePath}", rev, sha256 }: {
-    inherit goPackagePath;
-    src = pkgs.fetchgit { inherit url rev sha256; };
-  };
-
-  goose = let
-    owner = "liamstask";
-    repo = "goose";
-    rev = "8488cc47d90c8a502b1c41a462a6d9cc8ee0a895";
-    version = "20150116";
-
-  in pkgs.buildGoPackage rec {
-    name = "${repo}-${version}";
-
-    src = pkgs.fetchFromBitbucket {
-      name = "${name}-src";
-      inherit rev owner repo;
-      sha256 = "1jy0pscxjnxjdg3hj111w21g8079rq9ah2ix5ycxxhbbi3f0wdhs";
-    };
-
-    goPackagePath = "bitbucket.org/${owner}/${repo}";
-    subPackages = [ "cmd/goose" ];
-    extraSrcs = map mkGoDep [
-      { goPackagePath = "github.com/go-sql-driver/mysql";
-        rev = "2e00b5cd70399450106cec6431c2e2ce3cae5034";
-        sha256 = "085g48jq9hzmlcxg122n0c4pi41sc1nn2qpx1vrl2jfa8crsppa5";
-      }
-      { goPackagePath = "github.com/kylelemons/go-gypsy";
-        rev = "08cad365cd28a7fba23bb1e57aa43c5e18ad8bb8";
-        sha256 = "1djv7nii3hy451n5jlslk0dblqzb1hia1cbqpdwhnps1g8hqjy8q";
-      }
-      { goPackagePath = "github.com/lib/pq";
-        rev = "ba5d4f7a35561e22fbdf7a39aa0070f4d460cfc0";
-        sha256 = "1mfbqw9g00bk24bfmf53wri5c2wqmgl0qh4sh1qv2da13a7cwwg3";
-      }
-      { goPackagePath = "github.com/mattn/go-sqlite3";
-        rev = "2acfafad5870400156f6fceb12852c281cbba4d5";
-        sha256 = "1rpgil3w4hh1cibidskv1js898hwz83ps06gh0hm3mym7ki8d5h7";
-      }
-      { goPackagePath = "github.com/ziutek/mymysql";
-        rev = "0582bcf675f52c0c2045c027fd135bd726048f45";
-        sha256 = "0bkc9x8sgqbzgdimsmsnhb0qrzlzfv33fgajmmjxl4hcb21qz3rf";
-      }
-      { goPackagePath = "golang.org/x/net";
-        url = "https://go.googlesource.com/net";
-        rev = "10c134ea0df15f7e34d789338c7a2d76cc7a3ab9";
-        sha256 = "14cbr2shl08gyg85n5gj7nbjhrhhgrd52h073qd14j97qcxsakcz";
-      }
-    ];
-  };
-
-  boulder = let
-    owner = "letsencrypt";
-    repo = "boulder";
-    rev = "9866abab8962a591f06db457a4b84c518cc88243";
-    version = "20170510";
-
-  in pkgs.buildGoPackage rec {
-    name = "${repo}-${version}";
-
-    src = pkgs.fetchFromGitHub {
-      name = "${name}-src";
-      inherit rev owner repo;
-      sha256 = "170m5cjngbrm36wi7wschqw8jzs7kxpcyzmshq3pcrmcpigrhna1";
-    };
-
-    postPatch = ''
-      # compat for go < 1.8
-      sed -i -e 's/time\.Until(\([^)]\+\))/\1.Sub(time.Now())/' \
-        test/ocsp/helper/helper.go
-
-      find test -type f -exec sed -i -e '/libpkcs11-proxy.so/ {
-        s,/usr/local,${pkcs11-proxy},
-      }' {} +
-
-      sed -i -r \
-        -e '/^def +install/a \    return True' \
-        -e 's,exec \./bin/,,' \
-        test/startservers.py
-
-      cat "${snakeOilCa}/ca.key" > test/test-ca.key
-      cat "${snakeOilCa}/ca.pem" > test/test-ca.pem
-    '';
-
-    goPackagePath = "github.com/${owner}/${repo}";
-    buildInputs = [ pkgs.libtool ];
-  };
-
-  boulderSource = "${boulder.out}/share/go/src/${boulder.goPackagePath}";
-
-  softHsmConf = pkgs.writeText "softhsm.conf" ''
-    0:/var/lib/softhsm/slot0.db
-    1:/var/lib/softhsm/slot1.db
-  '';
-
-  snakeOilCa = pkgs.runCommand "snakeoil-ca" {
-    buildInputs = [ pkgs.openssl ];
-  } ''
-    mkdir "$out"
-    openssl req -newkey rsa:4096 -x509 -sha256 -days 36500 \
-      -subj '/CN=Snakeoil CA' -nodes \
-      -out "$out/ca.pem" -keyout "$out/ca.key"
-  '';
-
-  createAndSignCert = fqdn: let
-    snakeoilCertConf = pkgs.writeText "snakeoil.cnf" ''
-      [req]
-      default_bits = 4096
-      prompt = no
-      default_md = sha256
-      req_extensions = req_ext
-      distinguished_name = dn
-      [dn]
-      CN = ${fqdn}
-      [req_ext]
-      subjectAltName = DNS:${fqdn}
-    '';
-  in pkgs.runCommand "snakeoil-certs-${fqdn}" {
-    buildInputs = [ pkgs.openssl ];
-  } ''
-    mkdir "$out"
-    openssl genrsa -out "$out/snakeoil.key" 4096
-    openssl req -new -key "$out/snakeoil.key" \
-      -config ${lib.escapeShellArg snakeoilCertConf} \
-      -out snakeoil.csr
-    openssl x509 -req -in snakeoil.csr -sha256 -set_serial 666 \
-      -CA "${snakeOilCa}/ca.pem" -CAkey "${snakeOilCa}/ca.key" \
-      -extfile ${lib.escapeShellArg snakeoilCertConf} \
-      -out "$out/snakeoil.pem" -days 36500
-  '';
-
-  wfeCerts = createAndSignCert wfeDomain;
-  wfeDomain = "acme-v01.api.letsencrypt.org";
-  wfeCertFile = "${wfeCerts}/snakeoil.pem";
-  wfeKeyFile = "${wfeCerts}/snakeoil.key";
-
-  siteCerts = createAndSignCert siteDomain;
-  siteDomain = "letsencrypt.org";
-  siteCertFile = "${siteCerts}/snakeoil.pem";
-  siteKeyFile = "${siteCerts}/snakeoil.key";
-
-  # Retrieved via:
-  # curl -s -I https://acme-v01.api.letsencrypt.org/terms \
-  #   | sed -ne 's/^[Ll]ocation: *//p'
-  tosUrl = "https://letsencrypt.org/documents/LE-SA-v1.1.1-August-1-2016.pdf";
-  tosPath = builtins.head (builtins.match "https?://[^/]+(.*)" tosUrl);
-
-  tosFile = pkgs.fetchurl {
-    url = tosUrl;
-    sha256 = "08b2gacdz23mzji2pjr1pwnk82a84rzvr36isif7mmi9kydl6wv3";
-  };
-
-  resolver = let
-    message = "You need to define a resolver for the letsencrypt test module.";
-    firstNS = lib.head config.networking.nameservers;
-  in if config.networking.nameservers == [] then throw message else firstNS;
-
-  cfgDir = pkgs.stdenv.mkDerivation {
-    name = "boulder-config";
-    src = "${boulderSource}/test/config";
-    nativeBuildInputs = [ pkgs.jq ];
-    phases = [ "unpackPhase" "patchPhase" "installPhase" ];
-    postPatch = ''
-      sed -i -e 's/5002/80/' -e 's/5002/443/' va.json
-      sed -i -e '/listenAddress/s/:4000/:80/' wfe.json
-      sed -i -r \
-        -e ${lib.escapeShellArg "s,http://boulder:4000/terms/v1,${tosUrl},g"} \
-        -e 's,http://(boulder|127\.0\.0\.1):4000,https://${wfeDomain},g' \
-        -e '/dnsResolver/s/127\.0\.0\.1:8053/${resolver}:53/' \
-        *.json
-      if grep 4000 *.json; then exit 1; fi
-
-      # Change all ports from 1909X to 909X, because the 1909X range of ports is
-      # allocated by startservers.py in order to intercept gRPC communication.
-      sed -i -e 's/\<1\(909[0-9]\)\>/\1/' *.json
-
-      # Patch out all additional issuer certs
-      jq '. + {ca: (.ca + {Issuers:
-        [.ca.Issuers[] | select(.CertFile == "test/test-ca.pem")]
-      })}' ca.json > tmp
-      mv tmp ca.json
-    '';
-    installPhase = "cp -r . \"$out\"";
-  };
-
-  components = {
-    gsb-test-srv.args = "-apikey my-voice-is-my-passport";
-    gsb-test-srv.waitForPort = 6000;
-    gsb-test-srv.first = true;
-    boulder-sa.args = "--config ${cfgDir}/sa.json";
-    boulder-wfe.args = "--config ${cfgDir}/wfe.json";
-    boulder-ra.args = "--config ${cfgDir}/ra.json";
-    boulder-ca.args = "--config ${cfgDir}/ca.json";
-    boulder-va.args = "--config ${cfgDir}/va.json";
-    boulder-publisher.args = "--config ${cfgDir}/publisher.json";
-    boulder-publisher.waitForPort = 9091;
-    ocsp-updater.args = "--config ${cfgDir}/ocsp-updater.json";
-    ocsp-updater.after = [ "boulder-publisher" ];
-    ocsp-responder.args = "--config ${cfgDir}/ocsp-responder.json";
-    ct-test-srv = {};
-    mail-test-srv.args = "--closeFirst 5";
-  };
-
-  commonPath = [ softhsm pkgs.mariadb goose boulder ];
-
-  mkServices = a: b: with lib; listToAttrs (concatLists (mapAttrsToList a b));
-
-  componentServices = mkServices (name: attrs: let
-    mkSrvName = n: "boulder-${n}.service";
-    firsts = lib.filterAttrs (lib.const (c: c.first or false)) components;
-    firstServices = map mkSrvName (lib.attrNames firsts);
-    firstServicesNoSelf = lib.remove "boulder-${name}.service" firstServices;
-    additionalAfter = firstServicesNoSelf ++ map mkSrvName (attrs.after or []);
-    needsPort = attrs ? waitForPort;
-    inits = map (n: "boulder-init-${n}.service") [ "mysql" "softhsm" ];
-    portWaiter = {
-      name = "boulder-${name}";
-      value = {
-        description = "Wait For Port ${toString attrs.waitForPort} (${name})";
-        after = [ "boulder-real-${name}.service" "bind.service" ];
-        requires = [ "boulder-real-${name}.service" ];
-        requiredBy = [ "boulder.service" ];
-        serviceConfig.Type = "oneshot";
-        serviceConfig.RemainAfterExit = true;
-        script = let
-          netcat = "${pkgs.netcat-openbsd}/bin/nc";
-          portCheck = "${netcat} -z 127.0.0.1 ${toString attrs.waitForPort}";
-        in "while ! ${portCheck}; do :; done";
-      };
-    };
-  in lib.optional needsPort portWaiter ++ lib.singleton {
-    name = if needsPort then "boulder-real-${name}" else "boulder-${name}";
-    value = {
-      description = "Boulder ACME Component (${name})";
-      after = inits ++ additionalAfter;
-      requires = inits;
-      requiredBy = [ "boulder.service" ];
-      path = commonPath;
-      environment.GORACE = "halt_on_error=1";
-      environment.SOFTHSM_CONF = softHsmConf;
-      environment.PKCS11_PROXY_SOCKET = "tcp://127.0.0.1:5657";
-      serviceConfig.WorkingDirectory = boulderSource;
-      serviceConfig.ExecStart = "${boulder}/bin/${name} ${attrs.args or ""}";
-      serviceConfig.Restart = "on-failure";
-    };
-  }) components;
-
-in {
-  imports = [ ./resolver.nix ];
-
-  options.test-support.letsencrypt.caCert = lib.mkOption {
-    type = lib.types.path;
-    description = ''
-      A certificate file to use with the <literal>nodes</literal> attribute to
-      inject the snakeoil CA certificate used in the ACME server into
-      <option>security.pki.certificateFiles</option>.
-    '';
-  };
-
-  config = {
-    test-support = {
-      resolver.enable = let
-        isLocalResolver = config.networking.nameservers == [ "127.0.0.1" ];
-      in lib.mkOverride 900 isLocalResolver;
-      letsencrypt.caCert = "${snakeOilCa}/ca.pem";
-    };
-
-    # This has priority 140, because modules/testing/test-instrumentation.nix
-    # already overrides this with priority 150.
-    networking.nameservers = lib.mkOverride 140 [ "127.0.0.1" ];
-    networking.firewall.enable = false;
-
-    networking.extraHosts = ''
-      127.0.0.1 ${toString [
-        "sa.boulder" "ra.boulder" "wfe.boulder" "ca.boulder" "va.boulder"
-        "publisher.boulder" "ocsp-updater.boulder" "admin-revoker.boulder"
-        "boulder" "boulder-mysql" wfeDomain
-      ]}
-      ${config.networking.primaryIPAddress} ${wfeDomain} ${siteDomain}
-    '';
-
-    services.mysql.enable = true;
-    services.mysql.package = pkgs.mariadb;
-
-    services.nginx.enable = true;
-    services.nginx.recommendedProxySettings = true;
-    services.nginx.virtualHosts.${wfeDomain} = {
-      onlySSL = true;
-      enableACME = false;
-      sslCertificate = wfeCertFile;
-      sslCertificateKey = wfeKeyFile;
-      locations."/".proxyPass = "http://127.0.0.1:80";
-    };
-    services.nginx.virtualHosts.${siteDomain} = {
-      onlySSL = true;
-      enableACME = false;
-      sslCertificate = siteCertFile;
-      sslCertificateKey = siteKeyFile;
-      locations.${tosPath}.extraConfig = "alias ${tosFile};";
-    };
-
-    systemd.services = {
-      pkcs11-daemon = {
-        description = "PKCS11 Daemon";
-        after = [ "boulder-init-softhsm.service" ];
-        before = map (n: "${n}.service") (lib.attrNames componentServices);
-        wantedBy = [ "multi-user.target" ];
-        environment.SOFTHSM_CONF = softHsmConf;
-        environment.PKCS11_DAEMON_SOCKET = "tcp://127.0.0.1:5657";
-        serviceConfig.ExecStart = let
-          softhsmLib = "${softhsm}/lib/softhsm/libsofthsm.so";
-        in "${pkcs11-proxy}/bin/pkcs11-daemon ${softhsmLib}";
-      };
-
-      boulder-init-mysql = {
-        description = "Boulder ACME Init (MySQL)";
-        after = [ "mysql.service" ];
-        serviceConfig.Type = "oneshot";
-        serviceConfig.RemainAfterExit = true;
-        serviceConfig.WorkingDirectory = boulderSource;
-        path = commonPath;
-        script = "${pkgs.bash}/bin/sh test/create_db.sh";
-      };
-
-      boulder-init-softhsm = {
-        description = "Boulder ACME Init (SoftHSM)";
-        environment.SOFTHSM_CONF = softHsmConf;
-        serviceConfig.Type = "oneshot";
-        serviceConfig.RemainAfterExit = true;
-        serviceConfig.WorkingDirectory = boulderSource;
-        preStart = "mkdir -p /var/lib/softhsm";
-        path = commonPath;
-        script = ''
-          softhsm --slot 0 --init-token \
-            --label intermediate --pin 5678 --so-pin 1234
-          softhsm --slot 0 --import test/test-ca.key \
-            --label intermediate_key --pin 5678 --id FB
-          softhsm --slot 1 --init-token \
-            --label root --pin 5678 --so-pin 1234
-          softhsm --slot 1 --import test/test-root.key \
-            --label root_key --pin 5678 --id FA
-        '';
-      };
-
-      boulder = {
-        description = "Boulder ACME Server";
-        after = map (n: "${n}.service") (lib.attrNames componentServices);
-        wantedBy = [ "multi-user.target" ];
-        serviceConfig.Type = "oneshot";
-        serviceConfig.RemainAfterExit = true;
-        script = let
-          ports = lib.range 8000 8005 ++ lib.singleton 80;
-          netcat = "${pkgs.netcat-openbsd}/bin/nc";
-          mkPortCheck = port: "${netcat} -z 127.0.0.1 ${toString port}";
-          checks = "(${lib.concatMapStringsSep " && " mkPortCheck ports})";
-        in "while ! ${checks}; do :; done";
-      };
-    } // componentServices;
-  };
-}

nixos/tests/common/resolver.nix

@@ -1,141 +0,0 @@
-# This module automatically discovers zones in BIND and NSD NixOS
-# configurations and creates zones for all definitions of networking.extraHosts
-# (except those that point to 127.0.0.1 or ::1) within the current test network
-# and delegates these zones using a fake root zone served by a BIND recursive
-# name server.
-{ config, nodes, pkgs, lib, ... }:
-
-{
-  options.test-support.resolver.enable = lib.mkOption {
-    type = lib.types.bool;
-    default = true;
-    internal = true;
-    description = ''
-      Whether to enable the resolver that automatically discovers zone in the
-      test network.
-
-      This option is <literal>true</literal> by default, because the module
-      defining this option needs to be explicitly imported.
-
-      The reason this option exists is for the
-      <filename>nixos/tests/common/letsencrypt.nix</filename> module, which
-      needs that option to disable the resolver once the user has set its own
-      resolver.
-    '';
-  };
-
-  config = lib.mkIf config.test-support.resolver.enable {
-    networking.firewall.enable = false;
-    services.bind.enable = true;
-    services.bind.cacheNetworks = lib.mkForce [ "any" ];
-    services.bind.forwarders = lib.mkForce [];
-    services.bind.zones = lib.singleton {
-      name = ".";
-      file = let
-        addDot = zone: zone + lib.optionalString (!lib.hasSuffix "." zone) ".";
-        mkNsdZoneNames = zones: map addDot (lib.attrNames zones);
-        mkBindZoneNames = zones: map (zone: addDot zone.name) zones;
-        getZones = cfg: mkNsdZoneNames cfg.services.nsd.zones
-                     ++ mkBindZoneNames cfg.services.bind.zones;
-
-        getZonesForNode = attrs: {
-          ip = attrs.config.networking.primaryIPAddress;
-          zones = lib.filter (zone: zone != ".") (getZones attrs.config);
-        };
-
-        zoneInfo = lib.mapAttrsToList (lib.const getZonesForNode) nodes;
-
-        # A and AAAA resource records for all the definitions of
-        # networking.extraHosts except those for 127.0.0.1 or ::1.
-        #
-        # The result is an attribute set with keys being the host name and the
-        # values are either { ipv4 = ADDR; } or { ipv6 = ADDR; } where ADDR is
-        # the IP address for the corresponding key.
-        recordsFromExtraHosts = let
-          getHostsForNode = lib.const (n: n.config.networking.extraHosts);
-          allHostsList = lib.mapAttrsToList getHostsForNode nodes;
-          allHosts = lib.concatStringsSep "\n" allHostsList;
-
-          reIp = "[a-fA-F0-9.:]+";
-          reHost = "[a-zA-Z0-9.-]+";
-
-          matchAliases = str: let
-            matched = builtins.match "[ \t]+(${reHost})(.*)" str;
-            continue = lib.singleton (lib.head matched)
-                    ++ matchAliases (lib.last matched);
-          in if matched == null then [] else continue;
-
-          matchLine = str: let
-            result = builtins.match "[ \t]*(${reIp})[ \t]+(${reHost})(.*)" str;
-          in if result == null then null else {
-            ipAddr = lib.head result;
-            hosts = lib.singleton (lib.elemAt result 1)
-                 ++ matchAliases (lib.last result);
-          };
-
-          skipLine = str: let
-            rest = builtins.match "[^\n]*\n(.*)" str;
-          in if rest == null then "" else lib.head rest;
-
-          getEntries = str: acc: let
-            result = matchLine str;
-            next = getEntries (skipLine str);
-            newEntry = acc ++ lib.singleton result;
-            continue = if result == null then next acc else next newEntry;
-          in if str == "" then acc else continue;
-
-          isIPv6 = str: builtins.match ".*:.*" str != null;
-          loopbackIps = [ "127.0.0.1" "::1" ];
-          filterLoopback = lib.filter (e: !lib.elem e.ipAddr loopbackIps);
-
-          allEntries = lib.concatMap (entry: map (host: {
-            inherit host;
-            ${if isIPv6 entry.ipAddr then "ipv6" else "ipv4"} = entry.ipAddr;
-          }) entry.hosts) (filterLoopback (getEntries (allHosts + "\n") []));
-
-          mkRecords = entry: let
-            records = lib.optional (entry ? ipv6) "AAAA ${entry.ipv6}"
-                   ++ lib.optional (entry ? ipv4) "A ${entry.ipv4}";
-            mkRecord = typeAndData: "${entry.host}. IN ${typeAndData}";
-          in lib.concatMapStringsSep "\n" mkRecord records;
-
-        in lib.concatMapStringsSep "\n" mkRecords allEntries;
-
-        # All of the zones that are subdomains of existing zones.
-        # For example if there is only "example.com" the following zones would
-        # be 'subZones':
-        #
-        #  * foo.example.com.
-        #  * bar.example.com.
-        #
-        # While the following would *not* be 'subZones':
-        #
-        #  * example.com.
-        #  * com.
-        #
-        subZones = let
-          allZones = lib.concatMap (zi: zi.zones) zoneInfo;
-          isSubZoneOf = z1: z2: lib.hasSuffix z2 z1 && z1 != z2;
-        in lib.filter (z: lib.any (isSubZoneOf z) allZones) allZones;
-
-        # All the zones without 'subZones'.
-        filteredZoneInfo = map (zi: zi // {
-          zones = lib.filter (x: !lib.elem x subZones) zi.zones;
-        }) zoneInfo;
-
-      in pkgs.writeText "fake-root.zone" ''
-        $TTL 3600
-        . IN SOA ns.fakedns. admin.fakedns. ( 1 3h 1h 1w 1d )
-        ns.fakedns. IN A ${config.networking.primaryIPAddress}
-        . IN NS ns.fakedns.
-        ${lib.concatImapStrings (num: { ip, zones }: ''
-          ns${toString num}.fakedns. IN A ${ip}
-          ${lib.concatMapStrings (zone: ''
-          ${zone} IN NS ns${toString num}.fakedns.
-          '') zones}
-        '') (lib.filter (zi: zi.zones != []) filteredZoneInfo)}
-        ${recordsFromExtraHosts}
-      '';
-    };
-  };
-}

nixos/tests/docker-edge.nix

@@ -1,47 +0,0 @@
-# This test runs docker and checks if simple container starts
-
-import ./make-test.nix ({ pkgs, ...} : {
-  name = "docker";
-  meta = with pkgs.stdenv.lib.maintainers; {
-    maintainers = [ nequissimus offline ];
-  };
-
-  nodes = {
-    docker =
-      { config, pkgs, ... }:
-        {
-          virtualisation.docker.enable = true;
-          virtualisation.docker.package = pkgs.docker-edge;
-
-          users.users = {
-            noprivs = {
-              isNormalUser = true;
-              description = "Can't access the docker daemon";
-              password = "foobar";
-            };
-
-            hasprivs = {
-              isNormalUser = true;
-              description = "Can access the docker daemon";
-              password = "foobar";
-              extraGroups = [ "docker" ];
-            };
-          };
-        };
-    };
-
-  testScript = ''
-    startAll;
-
-    $docker->waitForUnit("sockets.target");
-    $docker->succeed("tar cv --files-from /dev/null | docker import - scratchimg");
-    $docker->succeed("docker run -d --name=sleeping -v /nix/store:/nix/store -v /run/current-system/sw/bin:/bin scratchimg /bin/sleep 10");
-    $docker->succeed("docker ps | grep sleeping");
-    $docker->succeed("sudo -u hasprivs docker ps");
-    $docker->fail("sudo -u noprivs docker ps");
-    $docker->succeed("docker stop sleeping");
-
-    # Must match version twice to ensure client and server versions are correct
-    $docker->succeed('[ $(docker version | grep ${pkgs.docker-edge.version} | wc -l) = "2" ]');
-  '';
-})

nixos/tests/docker.nix

@@ -3,7 +3,7 @@
 import ./make-test.nix ({ pkgs, ...} : {
   name = "docker";
   meta = with pkgs.stdenv.lib.maintainers; {
-    maintainers = [ nequissimus offline ];
+    maintainers = [ offline ];
   };
 
   nodes = {
@@ -11,7 +11,6 @@ import ./make-test.nix ({ pkgs, ...} : {
       { config, pkgs, ... }:
         {
           virtualisation.docker.enable = true;
-          virtualisation.docker.package = pkgs.docker;
 
           users.users = {
             noprivs = {
@@ -40,8 +39,5 @@ import ./make-test.nix ({ pkgs, ...} : {
     $docker->succeed("sudo -u hasprivs docker ps");
     $docker->fail("sudo -u noprivs docker ps");
     $docker->succeed("docker stop sleeping");
-
-    # Must match version twice to ensure client and server versions are correct
-    $docker->succeed('[ $(docker version | grep ${pkgs.docker.version} | wc -l) = "2" ]');
   '';
 })

nixos/tests/env.nix

@@ -1,35 +0,0 @@
-import ./make-test.nix ({ pkgs, ...} : {
-  name = "environment";
-  meta = with pkgs.stdenv.lib.maintainers; {
-    maintainers = [ nequissimus ];
-  };
-
-  machine = { config, lib, pkgs, ... }:
-    {
-      boot.kernelPackages = pkgs.linuxPackages;
-      environment.etc."plainFile".text = ''
-        Hello World
-      '';
-      environment.etc."folder/with/file".text = ''
-        Foo Bar!
-      '';
-
-      environment.sessionVariables = {
-        TERMINFO_DIRS = "/run/current-system/sw/share/terminfo";
-        NIXCON = "awesome";
-      };
-    };
-
-  testScript =
-    ''
-      $machine->succeed('[ -L "/etc/plainFile" ]');
-      $machine->succeed('cat "/etc/plainFile" | grep "Hello World"');
-      $machine->succeed('[ -d "/etc/folder" ]');
-      $machine->succeed('[ -d "/etc/folder/with" ]');
-      $machine->succeed('[ -L "/etc/folder/with/file" ]');
-      $machine->succeed('cat "/etc/plainFile" | grep "Hello World"');
-
-      $machine->succeed('echo ''${TERMINFO_DIRS} | grep "/run/current-system/sw/share/terminfo"');
-      $machine->succeed('echo ''${NIXCON} | grep "awesome"');
-    '';
-})

nixos/tests/grafana.nix

@@ -1,25 +0,0 @@
-import ./make-test.nix ({ lib, ... }:
-{
-  name = "grafana";
-
-  meta = with lib.maintainers; {
-    maintainers = [ willibutz ];
-  };
-
-  machine = { config, pkgs, ... }: {
-    services.grafana = {
-      enable = true;
-      addr = "localhost";
-      analytics.reporting.enable = false;
-      domain = "localhost";
-      security.adminUser = "testusername";
-    };
-  };
-
-  testScript = ''
-    $machine->start;
-    $machine->waitForUnit("grafana.service");
-    $machine->waitForOpenPort(3000);
-    $machine->succeed("curl -sS http://127.0.0.1:3000/");
-  '';
-})

nixos/tests/initrd-network-ssh.nix

@@ -1,74 +0,0 @@
-import ./make-test.nix ({ pkgs, lib, ... }:
-
-let
-  keys = pkgs.runCommand "gen-keys" {
-    outputs = [ "out" "dbPub" "dbPriv" "sshPub" "sshPriv" ];
-    buildInputs = with pkgs; [ dropbear openssh ];
-  }
-  ''
-    touch $out
-    dropbearkey -t rsa -f $dbPriv -s 4096 | sed -n 2p > $dbPub
-    ssh-keygen -q -t rsa -b 4096 -N "" -f client
-    mv client $sshPriv
-    mv client.pub $sshPub
-  '';
-
-in {
-  name = "initrd-network-ssh";
-  meta = with lib.maintainers; {
-    maintainers = [ willibutz ];
-  };
-
-  nodes = with lib; rec {
-    server =
-      { config, pkgs, ... }:
-      {
-        boot.kernelParams = [
-          "ip=${
-            (head config.networking.interfaces.eth1.ip4).address
-          }:::255.255.255.0::eth1:none"
-        ];
-        boot.initrd.network = {
-          enable = true;
-          ssh = {
-            enable = true;
-            authorizedKeys = [ "${readFile keys.sshPub}" ];
-            port = 22;
-            hostRSAKey = keys.dbPriv;
-          };
-        };
-        boot.initrd.preLVMCommands = ''
-          while true; do
-            if [ -f fnord ]; then
-              poweroff
-            fi
-            sleep 1
-          done
-        '';
-      };
-
-    client =
-      { config, pkgs, ... }:
-      {
-        environment.etc.knownHosts = {
-          text = concatStrings [
-            "server,"
-            "${toString (head (splitString " " (
-              toString (elemAt (splitString "\n" config.networking.extraHosts) 2)
-            )))} "
-            "${readFile keys.dbPub}"
-          ];
-        };
-      };
-  };
-
-  testScript = ''
-    startAll;
-    $client->waitForUnit("network.target");
-    $client->copyFileFromHost("${keys.sshPriv}","/etc/sshKey");
-    $client->succeed("chmod 0600 /etc/sshKey");
-    $client->waitUntilSucceeds("ping -c 1 server");
-    $client->succeed("ssh -i /etc/sshKey -o UserKnownHostsFile=/etc/knownHosts server 'touch /fnord'");
-    $client->shutdown;
-  '';
-})

nixos/tests/kernel-copperhead.nix

@@ -1,19 +0,0 @@
-import ./make-test.nix ({ pkgs, ...} : {
-  name = "kernel-copperhead";
-  meta = with pkgs.stdenv.lib.maintainers; {
-    maintainers = [ nequissimus ];
-  };
-
-  machine = { config, lib, pkgs, ... }:
-    {
-      boot.kernelPackages = pkgs.linuxPackages_hardened_copperhead;
-    };
-
-  testScript =
-    ''
-      $machine->succeed("uname -a");
-      $machine->succeed("uname -s | grep 'Linux'");
-      $machine->succeed("uname -a | grep '${pkgs.linuxPackages_hardened_copperhead.kernel.modDirVersion}'");
-      $machine->succeed("uname -a | grep 'hardened'");
-    '';
-})

nixos/tests/kernel-latest.nix

@@ -1,17 +0,0 @@
-import ./make-test.nix ({ pkgs, ...} : {
-  name = "kernel-latest";
-  meta = with pkgs.stdenv.lib.maintainers; {
-    maintainers = [ nequissimus ];
-  };
-
-  machine = { config, lib, pkgs, ... }:
-    {
-      boot.kernelPackages = pkgs.linuxPackages_latest;
-    };
-
-  testScript =
-    ''
-      $machine->succeed("uname -s | grep 'Linux'");
-      $machine->succeed("uname -a | grep '${pkgs.linuxPackages_latest.kernel.version}'");
-    '';
-})

nixos/tests/kernel-lts.nix

@@ -1,17 +0,0 @@
-import ./make-test.nix ({ pkgs, ...} : {
-  name = "kernel-lts";
-  meta = with pkgs.stdenv.lib.maintainers; {
-    maintainers = [ nequissimus ];
-  };
-
-  machine = { config, lib, pkgs, ... }:
-    {
-      boot.kernelPackages = pkgs.linuxPackages;
-    };
-
-  testScript =
-    ''
-      $machine->succeed("uname -s | grep 'Linux'");
-      $machine->succeed("uname -a | grep '${pkgs.linuxPackages.kernel.version}'");
-    '';
-})

nixos/tests/krb5/default.nix

@@ -1,5 +0,0 @@
-{ system ? builtins.currentSystem }:
-{
-  example-config = import ./example-config.nix { inherit system; };
-  deprecated-config = import ./deprecated-config.nix { inherit system; };
-}

nixos/tests/krb5/deprecated-config.nix

@@ -1,48 +0,0 @@
-# Verifies that the configuration suggested in deprecated example values
-# will result in the expected output.
-
-import ../make-test.nix ({ pkgs, ...} : {
-  name = "krb5-with-deprecated-config";
-  meta = with pkgs.stdenv.lib.maintainers; {
-    maintainers = [ eqyiel ];
-  };
-
-  machine =
-    { config, pkgs, ... }: {
-      krb5 = {
-        enable = true;
-        defaultRealm = "ATHENA.MIT.EDU";
-        domainRealm = "athena.mit.edu";
-        kdc = "kerberos.mit.edu";
-        kerberosAdminServer = "kerberos.mit.edu";
-      };
-    };
-
-  testScript =
-    let snapshot = pkgs.writeText "krb5-with-deprecated-config.conf" ''
-      [libdefaults]
-        default_realm = ATHENA.MIT.EDU
-
-      [realms]
-        ATHENA.MIT.EDU = {
-          admin_server = kerberos.mit.edu
-          kdc = kerberos.mit.edu
-        }
-
-      [domain_realm]
-        .athena.mit.edu = ATHENA.MIT.EDU
-        athena.mit.edu = ATHENA.MIT.EDU
-
-      [capaths]
-
-
-      [appdefaults]
-
-
-      [plugins]
-
-    '';
-  in ''
-    $machine->succeed("diff /etc/krb5.conf ${snapshot}");
-  '';
-})

nixos/tests/krb5/example-config.nix

@@ -1,106 +0,0 @@
-# Verifies that the configuration suggested in (non-deprecated) example values
-# will result in the expected output.
-
-import ../make-test.nix ({ pkgs, ...} : {
-  name = "krb5-with-example-config";
-  meta = with pkgs.stdenv.lib.maintainers; {
-    maintainers = [ eqyiel ];
-  };
-
-  machine =
-    { config, pkgs, ... }: {
-      krb5 = {
-        enable = true;
-        kerberos = pkgs.krb5Full;
-        libdefaults = {
-          default_realm = "ATHENA.MIT.EDU";
-        };
-        realms = {
-          "ATHENA.MIT.EDU" = {
-            admin_server = "athena.mit.edu";
-            kdc = "athena.mit.edu";
-          };
-        };
-        domain_realm = {
-          "example.com" = "EXAMPLE.COM";
-          ".example.com" = "EXAMPLE.COM";
-        };
-        capaths = {
-          "ATHENA.MIT.EDU" = {
-            "EXAMPLE.COM" = ".";
-          };
-          "EXAMPLE.COM" = {
-            "ATHENA.MIT.EDU" = ".";
-          };
-        };
-        appdefaults = {
-          pam = {
-            debug = false;
-            ticket_lifetime = 36000;
-            renew_lifetime = 36000;
-            max_timeout = 30;
-            timeout_shift = 2;
-            initial_timeout = 1;
-          };
-        };
-        plugins = {
-          ccselect = {
-            disable = "k5identity";
-          };
-        };
-        extraConfig = ''
-          [logging]
-            kdc          = SYSLOG:NOTICE
-            admin_server = SYSLOG:NOTICE
-            default      = SYSLOG:NOTICE
-        '';
-      };
-    };
-
-  testScript =
-    let snapshot = pkgs.writeText "krb5-with-example-config.conf" ''
-      [libdefaults]
-        default_realm = ATHENA.MIT.EDU
-
-      [realms]
-        ATHENA.MIT.EDU = {
-          admin_server = athena.mit.edu
-          kdc = athena.mit.edu
-        }
-
-      [domain_realm]
-        .example.com = EXAMPLE.COM
-        example.com = EXAMPLE.COM
-
-      [capaths]
-        ATHENA.MIT.EDU = {
-          EXAMPLE.COM = .
-        }
-        EXAMPLE.COM = {
-          ATHENA.MIT.EDU = .
-        }
-
-      [appdefaults]
-        pam = {
-          debug = false
-          initial_timeout = 1
-          max_timeout = 30
-          renew_lifetime = 36000
-          ticket_lifetime = 36000
-          timeout_shift = 2
-        }
-
-      [plugins]
-        ccselect = {
-          disable = k5identity
-        }
-
-      [logging]
-        kdc          = SYSLOG:NOTICE
-        admin_server = SYSLOG:NOTICE
-        default      = SYSLOG:NOTICE
-    '';
-  in ''
-    $machine->succeed("diff /etc/krb5.conf ${snapshot}");
-  '';
-})

nixos/tests/misc.nix

@@ -26,7 +26,6 @@ import ./make-test.nix ({ pkgs, ...} : {
       users.users.sybil = { isNormalUser = true; group = "wheel"; };
       security.sudo = { enable = true; wheelNeedsPassword = false; };
       boot.kernel.sysctl."vm.swappiness" = 1;
-      boot.kernelParams = [ "vsyscall=emulate" ];
     };
 
   testScript =
@@ -127,10 +126,5 @@ import ./make-test.nix ({ pkgs, ...} : {
           $machine->execute('sysctl vm.swappiness=60');
           $machine->succeed('[ `sysctl -ne vm.swappiness` = 60 ]');
       };
-
-      # Test boot parameters
-      subtest "bootparam", sub {
-          $machine->succeed('grep -Fq vsyscall=emulate /proc/cmdline');
-      };
     '';
 })

nixos/tests/pgjwt.nix

@@ -1,37 +1,42 @@
-import ./make-test.nix ({ pkgs, lib, ...}:
+import ./make-test.nix ({ pkgs, ...} : 
 let
-  test = with pkgs; runCommand "patch-test" {
-    nativeBuildInputs = [ pgjwt ];
-  }
-  ''
-    sed -e '12 i CREATE EXTENSION pgcrypto;\nCREATE EXTENSION pgtap;\nSET search_path TO tap,public;' ${pgjwt.src}/test.sql > $out;
+  test = pkgs.writeText "test.sql" ''
+    CREATE EXTENSION pgcrypto;
+    CREATE EXTENSION pgjwt;
+    select sign('{"sub":"1234567890","name":"John Doe","admin":true}', 'secret');
+    select * from verify('eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwiYWRtaW4iOnRydWV9.TJVA95OrM7E2cBab30RMHrHDcEfxjoYZgeFONFh7HgQ', 'secret');
   '';
 in
-with pkgs; {
+{
   name = "pgjwt";
-  meta = with lib.maintainers; {
-    maintainers = [ spinus willibutz ];
+  meta = with pkgs.stdenv.lib.maintainers; {
+    maintainers = [ spinus ];
   };
 
   nodes = {
-    master = { pkgs, config, ... }:
+    master =
+      { pkgs, config, ... }:
+
       {
-      services.postgresql = {
+        services.postgresql = let mypg = pkgs.postgresql95; in {
             enable = true;
-        extraPlugins = [ pgjwt pgtap ];
+            package = mypg;
+            extraPlugins =[pkgs.pgjwt];
+            initialScript =  pkgs.writeText "postgresql-init.sql"
+          ''
+          CREATE ROLE postgres WITH superuser login createdb;
+          '';
           };
       };
   };
 
-  testScript = { nodes, ... }:
-  let
-    sqlSU = "${nodes.master.config.services.postgresql.superUser}";
-    pgProve = "${pkgs.perlPackages.TAPParserSourceHandlerpgTAP}";
-  in
-  ''
+  testScript = ''
     startAll;
     $master->waitForUnit("postgresql");
-    $master->copyFileFromHost("${test}","/tmp/test.sql");
-    $master->succeed("${pkgs.sudo}/bin/sudo -u ${sqlSU} PGOPTIONS=--search_path=tap,public ${pgProve}/bin/pg_prove -d postgres -v -f /tmp/test.sql");
+    $master->succeed("timeout 10 bash -c 'while ! psql postgres -c \"SELECT 1;\";do sleep 1;done;'");
+    $master->succeed("cat ${test} | psql postgres");
+    # I can't make original test working :[
+    # $master->succeed("${pkgs.perlPackages.TAPParserSourceHandlerpgTAP}/bin/pg_prove -d postgres ${pkgs.pgjwt.src}/test.sql");
+
   '';
 })

pkgs/applications/altcoins/dapp.nix

@@ -1,15 +1,15 @@
 { lib, stdenv, fetchFromGitHub, makeWrapper
-, seth, git, solc, shellcheck, nodejs, hevm }:
+, seth, git, solc, shellcheck, nodejs, hsevm }:
 
 stdenv.mkDerivation rec {
   name = "dapp";
-  version = "0.5.7";
+  version = "0.5.3";
 
   src = fetchFromGitHub {
     owner = "dapphub";
     repo = "dapp";
     rev = "v${version}";
-    sha256 = "128f35hczarihb263as391wr9zbyc1q1p49qbxh30via23r1brb0";
+    sha256 = "13b2krd02py8jnzjis44lay5i31d95z0myrsy5afzw7fa25giird";
   };
 
   nativeBuildInputs = [makeWrapper shellcheck];
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   checkPhase = "make test";
   makeFlags = ["prefix=$(out)"];
   postInstall = let path = lib.makeBinPath [
-    nodejs solc git seth hevm
+    nodejs solc git seth hsevm
   ]; in ''
     wrapProgram "$out/bin/dapp" --prefix PATH : "${path}"
   '';

pkgs/applications/altcoins/default.nix

@@ -49,7 +49,7 @@ rec {
   seth = callPackage ./seth.nix { };
   dapp = callPackage ./dapp.nix { };
 
-  hevm = (haskellPackages.callPackage ./hevm.nix {});
+  hsevm = (haskellPackages.callPackage ./hsevm.nix {});
 
   primecoin  = callPackage ./primecoin.nix { withGui = true; };
   primecoind = callPackage ./primecoin.nix { withGui = false; };

pkgs/applications/altcoins/ethrun.nix

@@ -20,5 +20,6 @@ buildRustPackage rec {
     homepage = https://github.com/dapphub/ethrun/;
     maintainers = [stdenv.lib.maintainers.dbrock];
     inherit version;
+    broken = true;
   };
 }

pkgs/applications/altcoins/go-ethereum.nix

@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "go-ethereum-${version}";
-  version = "1.7.1";
+  version = "1.7.0";
   goPackagePath = "github.com/ethereum/go-ethereum";
 
   # Fix for usb-related segmentation faults on darwin
@@ -16,7 +16,7 @@ buildGoPackage rec {
     owner = "ethereum";
     repo = "go-ethereum";
     rev = "v${version}";
-    sha256 = "1rhqnqp2d951d4084z7dc07q0my4wd5401968a0nqj030a9vgng2";
+    sha256 = "0ybjaiyrfb320rab6a5r9iiqvkrcd8b2qvixzx0kjmc4a7l1q5zh";
   };
 
   # Fix cyclic referencing on Darwin

pkgs/applications/altcoins/hivemind.nix

@@ -35,5 +35,6 @@ stdenv.mkDerivation rec {
     maintainers = with maintainers; [ canndrew ];
     license = licenses.mit;
     platforms = platforms.unix;
+    broken = true;
   };
 }

pkgs/applications/altcoins/hsevm.nix

@@ -1,28 +1,24 @@
-{ mkDerivation, abstract-par, aeson, ansi-wl-pprint, async, base
+{ mkDerivation, abstract-par, aeson, ansi-wl-pprint, base
 , base16-bytestring, base64-bytestring, binary, brick, bytestring
 , cereal, containers, cryptonite, data-dword, deepseq, directory
-, filepath, ghci-pretty, here, HUnit, lens
-, lens-aeson, memory, monad-par, mtl, optparse-generic, process
-, QuickCheck, quickcheck-text, readline, rosezipper, scientific
-, stdenv, tasty, tasty-hunit, tasty-quickcheck, temporary, text
-, text-format, time, unordered-containers, vector, vty
-
-, restless-git
-
+, filepath, ghci-pretty, here, HUnit, lens, lens-aeson, memory
+, monad-par, mtl, optparse-generic, process, QuickCheck
+, quickcheck-text, readline, rosezipper, scientific, stdenv, tasty, tasty-hunit
+, tasty-quickcheck, temporary, text, text-format
+, unordered-containers, vector, vty
 , fetchFromGitHub, lib, makeWrapper
 , ncurses, zlib, bzip2, solc, coreutils
-, bash
 }:
 
 lib.overrideDerivation (mkDerivation rec {
-  pname = "hevm";
-  version = "0.8.5";
+  pname = "hsevm";
+  version = "0.6.4";
 
   src = fetchFromGitHub {
     owner = "dapphub";
-    repo = "hevm";
+    repo = "hsevm";
     rev = "v${version}";
-    sha256 = "1a27bh0azf2hdg5hp6s9azv2rhzy7vrlq1kmg688g9nfwwwhgkp0";
+    sha256 = "01b67k9cam4gvsi07q3vx527m1w6p6xll64k1nl27bc8ik6jh8l9";
   };
 
   isLibrary = false;
@@ -30,9 +26,8 @@ lib.overrideDerivation (mkDerivation rec {
   enableSharedExecutables = false;
 
   postInstall = ''
-    wrapProgram $out/bin/hevm \
-       --add-flags '+RTS -N$((`${coreutils}/bin/nproc` - 1)) -RTS' \
-       --suffix PATH : "${lib.makeBinPath [bash coreutils]}"
+    rm -rf $out/{lib,share}
+    wrapProgram $out/bin/hsevm --add-flags '+RTS -N$((`${coreutils}/bin/nproc` - 1)) -RTS'
   '';
 
   extraLibraries = [
@@ -41,17 +36,17 @@ lib.overrideDerivation (mkDerivation rec {
     cryptonite data-dword deepseq directory filepath ghci-pretty lens
     lens-aeson memory monad-par mtl optparse-generic process QuickCheck
     quickcheck-text readline rosezipper scientific temporary text text-format
-    unordered-containers vector vty restless-git
+    unordered-containers vector vty
   ];
   executableHaskellDepends = [
-    async readline zlib bzip2
+    readline zlib bzip2
   ];
   testHaskellDepends = [
     base binary bytestring ghci-pretty here HUnit lens mtl QuickCheck
     tasty tasty-hunit tasty-quickcheck text vector
   ];
 
-  homepage = https://github.com/dapphub/hevm;
+  homepage = https://github.com/dapphub/hsevm;
   description = "Ethereum virtual machine evaluator";
   license = stdenv.lib.licenses.agpl3;
   maintainers = [stdenv.lib.maintainers.dbrock];

pkgs/applications/altcoins/zcash/default.nix

@@ -9,13 +9,13 @@ with stdenv.lib;
 stdenv.mkDerivation rec {
 
   name = "zcash" + (toString (optional (!withGui) "d")) + "-" + version;
-  version = "1.0.12";
+  version = "1.0.11";
 
   src = fetchFromGitHub {
     owner = "zcash";
     repo  = "zcash";
     rev = "v${version}";
-    sha256 = "19bxhdnkvgncgl9x6nbaf5nwgrdfw99icvdbi9adfh646pd5z64s";
+    sha256 = "09474jdhsg30maqrwfxigbw3llqi8axhh82lz3a23ii2gj68ni55";
   };
 
   enableParallelBuilding = true;

pkgs/applications/audio/ardour/default.nix

@@ -16,7 +16,7 @@ let
   # "git describe" when _not_ on an annotated tag(!): MAJOR.MINOR-REV-HASH.
 
   # Version to build.
-  tag = "5.12";
+  tag = "5.11";
 
 in
 
@@ -25,8 +25,8 @@ stdenv.mkDerivation rec {
 
   src = fetchgit {
     url = "git://git.ardour.org/ardour/ardour.git";
-    rev = "ae0dcdc0c5d13483271065c360e378202d20170a";
-    sha256 = "0mla5lm51ryikc2rrk53max2m7a5ds6i1ai921l2h95wrha45nkr";
+    rev = "bd40b9132cbac2d2b79ba0ef480bd41d837f8f71";
+    sha256 = "0xxxjg90jzj5cj364mlhk8srkgaghxif2jj1015bra25pffk41ay";
   };
 
   buildInputs =

pkgs/applications/audio/axoloti/default.nix

@@ -1,101 +0,0 @@
-{ stdenv, fetchFromGitHub, fetchurl, makeWrapper, unzip
-, gnumake, gcc-arm-embedded, dfu-util-axoloti, jdk, ant, libfaketime }:
-
-stdenv.mkDerivation rec {
-  version = "1.0.12-1";
-  name = "axoloti-${version}";
-
-  src = fetchFromGitHub {
-    owner = "axoloti";
-    repo = "axoloti";
-    rev = "${version}";
-    sha256 = "13njmv8zac0kaaxgkv4y4zfjcclafn9cw0m8lj2k4926wnwjmf50";
-  };
-
-  chibi_version = "2.6.9";
-  chibi_name = "ChibiOS_${chibi_version}";
-
-  chibios = fetchurl {
-    url = "mirror://sourceforge/project/chibios/ChibiOS_RT%20stable/Version%20${chibi_version}/${chibi_name}.zip";
-    sha256 = "0lb5s8pkj80mqhsy47mmq0lqk34s2a2m3xagzihalvabwd0frhlj";
-  };
-
-  buildInputs = [ makeWrapper unzip gcc-arm-embedded dfu-util-axoloti jdk ant libfaketime ];
-
-  patchPhase = ''
-    unzip ${chibios}
-    mv ${chibi_name} chibios
-    (cd chibios/ext; unzip -q -o fatfs-0.9-patched.zip)
-
-    # Remove source of non-determinism in ChibiOS
-    substituteInPlace "chibios/os/various/shell.c" \
-      --replace "#ifdef __DATE__" "#if 0"
-
-    # Hardcode full path to compiler tools
-    for f in "firmware/Makefile.patch" \
-             "firmware/Makefile" \
-             "firmware/flasher/Makefile" \
-             "firmware/mounter/Makefile"; do
-      substituteInPlace "$f" \
-        --replace "arm-none-eabi-" "${gcc-arm-embedded}/bin/arm-none-eabi-"
-    done
-
-    # Hardcode path to "make"
-    for f in "firmware/compile_firmware_linux.sh" \
-             "firmware/compile_patch_linux.sh"; do
-      substituteInPlace "$f" \
-        --replace "make" "${gnumake}/bin/make"
-    done
-
-    # Hardcode dfu-util path
-    substituteInPlace "platform_linux/upload_fw_dfu.sh" \
-      --replace "/bin/dfu-util" ""
-    substituteInPlace "platform_linux/upload_fw_dfu.sh" \
-      --replace "./dfu-util" "${dfu-util-axoloti}/bin/dfu-util"
-
-    # Fix build version
-    substituteInPlace "build.xml" \
-      --replace "(git missing)" "${version}"
-
-    # Remove build time
-    substituteInPlace "build.xml" \
-      --replace "<tstamp>" ""
-    substituteInPlace "build.xml" \
-      --replace \
-        '<format property="build.time" pattern="dd/MM/yyyy HH:mm:ss z"/>' \
-        '<property name="build.time" value=""/>'
-    substituteInPlace "build.xml" \
-      --replace "</tstamp>" ""
-    substituteInPlace "build.xml" \
-      --replace \
-       '{line.separator}</echo>' \
-       '{line.separator}</echo> <touch file="src/main/java/axoloti/Version.java" millis="0" />'
-  '';
-
-  buildPhase = ''
-    find . -exec touch -d '1970-01-01 00:00' {} \;
-    (cd platform_linux; sh compile_firmware.sh)
-    faketime "1970-01-01 00:00:00" ant -Dbuild.runtime=true
-  '';
-
-  installPhase = ''
-    mkdir -p $out/bin $out/share/axoloti
-
-    cp -r doc firmware chibios platform_linux CMSIS *.txt $out/share/axoloti/
-    install -vD dist/Axoloti.jar $out/share/axoloti/
-
-    makeWrapper ${jdk}/bin/java $out/bin/axoloti --add-flags "-Daxoloti_release=$out/share/axoloti -Daxoloti_runtime=$out/share/axoloti -jar $out/share/axoloti/Axoloti.jar"
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = http://www.axoloti.com;
-    description = ''
-      Sketching embedded digital audio algorithms.
-
-      To fix permissions of the Axoloti USB device node, add a similar udev rule to <literal>services.udev.extraRules</literal>:
-      <literal>SUBSYSTEM=="usb", ATTR{idVendor}=="16c0", ATTR{idProduct}=="0442", OWNER="someuser", GROUP="somegroup"</literal>
-    '';
-    license = licenses.gpl3;
-    maintainers = with maintainers; [ TealG ];
-  };
-}

pkgs/applications/audio/axoloti/dfu-util.nix

@@ -1,31 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, libusb1-axoloti }:
-
-stdenv.mkDerivation rec {
-  name="dfu-util-${version}";
-  version = "0.8";
-
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ libusb1-axoloti ];
-
-  src = fetchurl {
-    url = "http://dfu-util.sourceforge.net/releases/${name}.tar.gz";
-    sha256 = "0n7h08avlzin04j93m6hkq9id6hxjiiix7ff9gc2n89aw6dxxjsm";
-  };
-
-  meta = with stdenv.lib; {
-    description = "Device firmware update (DFU) USB programmer";
-    longDescription = ''
-      dfu-util is a program that implements the host (PC) side of the USB
-      DFU 1.0 and 1.1 (Universal Serial Bus Device Firmware Upgrade) protocol.
-
-      DFU is intended to download and upload firmware to devices connected over
-      USB. It ranges from small devices like micro-controller boards up to mobile
-      phones. With dfu-util you are able to download firmware to your device or
-      upload firmware from it.
-    '';
-    homepage = http://dfu-util.gnumonks.org/;
-    license = licenses.gpl2Plus;
-    platforms = platforms.unix;
-    maintainers = [ ];
-  };
-}

pkgs/applications/audio/axoloti/libusb1.nix

@@ -1,38 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, systemd ? null, libobjc, IOKit, fetchpatch }:
-
-stdenv.mkDerivation rec {
-  name = "libusb-1.0.19";
-
-  src = fetchurl {
-    url = "mirror://sourceforge/libusb/${name}.tar.bz2";
-    sha256 = "0h38p9rxfpg9vkrbyb120i1diq57qcln82h5fr7hvy82c20jql3c";
-  };
-
-  outputs = [ "out" "dev" ]; # get rid of propagating systemd closure
-
-  buildInputs = [ pkgconfig ];
-  propagatedBuildInputs =
-    stdenv.lib.optional stdenv.isLinux systemd ++
-    stdenv.lib.optionals stdenv.isDarwin [ libobjc IOKit ];
-
-  patches = [
-    (fetchpatch {
-      name = "libusb.stdfu.patch";
-      url = "https://raw.githubusercontent.com/axoloti/axoloti/1.0.12/platform_linux/src/libusb.stdfu.patch";
-      sha256 = "194j7j61i4q6x0ihm9ms8dxd4vliw20n2rj6cm9h17qzdl9xr33d";
-    })
-  ];
-
-  NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s";
-
-  preFixup = stdenv.lib.optionalString stdenv.isLinux ''
-    sed 's,-ludev,-L${systemd.lib}/lib -ludev,' -i $out/lib/libusb-1.0.la
-  '';
-
-  meta = {
-    homepage = http://www.libusb.info;
-    description = "User-space USB library";
-    platforms = stdenv.lib.platforms.unix;
-    maintainers = [ ];
-  };
-}

pkgs/applications/audio/cantata/default.nix

@@ -34,7 +34,7 @@ assert withOnlineServices -> withTaglib;
 assert withReplaygain -> withTaglib;
 
 let
-  version = "2.2.0";
+  version = "2.1.0";
   pname = "cantata";
   fstat = x: fn: "-DENABLE_" + fn + "=" + (if x then "ON" else "OFF");
   fstats = x: map (fstat x);
@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
     owner  = "CDrummond";
     repo   = "cantata";
     rev    = "v${version}";
-    sha256 = "1b633chgfs8rya78bzzck5zijna15d1y4nmrz4dcjp862ks5y5q6";
+    sha256 = "1mwc3cyrvg8qxjn70h4i6kdkvz85xspb3wi8wrb56jrhil409fkh";
   };
 
   buildInputs = [ vlc ]
@@ -86,16 +86,17 @@ stdenv.mkDerivation rec {
 
   # This is already fixed upstream but not released yet. Maybe in version 2.
   preConfigure = ''
-    # sed -i -e 's/STRLESS/VERSION_LESS/g' cmake/FindTaglib.cmake
+    sed -i -e 's/STRLESS/VERSION_LESS/g' cmake/FindTaglib.cmake
   '';
 
   meta = with stdenv.lib; {
     homepage = https://github.com/cdrummond/cantata;
     description = "A graphical client for MPD";
     license = licenses.gpl3;
-    maintainers = with maintainers; [ fuuzetsu peterhoeg ];
+
     # Technically Cantata can run on Windows so if someone wants to
     # bother figuring that one out, be my guest.
     platforms = platforms.linux;
+    maintainers = with maintainers; [ fuuzetsu ];
   };
 }

pkgs/applications/audio/clementine/default.nix

@@ -54,23 +54,19 @@ let
   ++ stdenv.lib.optionals (withCD) [libcdio]
   ++ stdenv.lib.optionals (withCloud) [sparsehash];
 
+  free = stdenv.mkDerivation {
+    name = "clementine-free-${version}";
+    inherit src patches nativeBuildInputs buildInputs;
+
+    cmakeFlags = [ "-DUSE_SYSTEM_PROJECTM=ON" ];
+
+    enableParallelBuilding = true;
     postPatch = ''
       sed -i src/CMakeLists.txt \
         -e 's,-Werror,,g' \
         -e 's,-Wno-unknown-warning-option,,g' \
         -e 's,-Wno-unused-private-field,,g'
-    sed -i CMakeLists.txt \
-      -e 's,libprotobuf.a,protobuf,g'
     '';
-
-  free = stdenv.mkDerivation {
-    name = "clementine-free-${version}";
-    inherit src patches nativeBuildInputs buildInputs postPatch;
-
-    cmakeFlags = [ "-DUSE_SYSTEM_PROJECTM=ON" ];
-
-    enableParallelBuilding = true;
-
     meta = with stdenv.lib; {
       homepage = http://www.clementine-player.org;
       description = "A multiplatform music player";
@@ -84,7 +80,7 @@ let
   blob = stdenv.mkDerivation {
     name = "clementine-blob-${version}";
     # Use the same patches and sources as Clementine
-    inherit src nativeBuildInputs postPatch;
+    inherit src nativeBuildInputs;
 
     patches = [
       ./clementine-spotify-blob.patch

pkgs/applications/audio/mopidy-gmusic/default.nix

@@ -13,7 +13,7 @@ pythonPackages.buildPythonApplication rec {
     mopidy
     pythonPackages.requests
     pythonPackages.gmusicapi
-    pythonPackages.cachetools_1
+    pythonPackages.cachetools
   ];
 
   doCheck = false;

pkgs/applications/audio/mopidy-iris/default.nix

@@ -2,12 +2,12 @@
 
 pythonPackages.buildPythonApplication rec {
   name = "mopidy-iris-${version}";
-  version = "3.4.9";
+  version = "3.4.1";
 
   src = pythonPackages.fetchPypi {
     inherit version;
     pname = "Mopidy-Iris";
-    sha256 = "0acr8ss5d0jgcy1qsjb12h0n6kr6qdp9zrbbk9vv3m3s6kcm8vgb";
+    sha256 = "04fjj2n5v53ykxnjgna1y8bvk7g3x0yiqisvzrdva693lfz9cbgx";
   };
 
   propagatedBuildInputs = [
@@ -16,7 +16,6 @@ pythonPackages.buildPythonApplication rec {
     pythonPackages.configobj
     pythonPackages.pylast
     pythonPackages.spotipy
-    pythonPackages.raven
   ];
 
   meta = with stdenv.lib; {

pkgs/applications/audio/pd-plugins/helmholtz/default.nix

@@ -39,5 +39,6 @@ stdenv.mkDerivation rec {
     license = stdenv.lib.licenses.bsd3;
     maintainers = [ stdenv.lib.maintainers.magnetophon ];
     platforms = stdenv.lib.platforms.linux;
+    broken = true;
   };
 }

pkgs/applications/audio/rosegarden/default.nix

@@ -1,6 +1,7 @@
-{ stdenv, fetchurl, cmake, makedepend, perl, pkgconfig, qttools
-, dssi, fftwSinglePrec, ladspaH, ladspaPlugins, libjack2
-, liblo, liblrdf, libsamplerate, libsndfile, lirc ? null, qtbase }:
+{ stdenv, fetchurl, cmake, qt4, pkgconfig, ladspaPlugins, ladspaH,
+  dssi, liblo, liblrdf, fftwSinglePrec, libsndfile,
+  libsamplerate, perl, makedepend, libjack2,
+  withLirc ? false, lirc ? null } :
 
 stdenv.mkDerivation (rec {
   version = "17.04";
@@ -11,25 +12,12 @@ stdenv.mkDerivation (rec {
     sha256 = "1khfcj22asdhjh0jvhkqsz200wgmigkhsrcz09ffia5hqm0n32lq";
   };
 
-  patchPhase = ''
-    substituteInPlace src/CMakeLists.txt --replace svnheader svnversion
-  '';
-
-  nativeBuildInputs = [ cmake makedepend perl pkgconfig qttools ];
+  QTDIR = qt4;
 
   buildInputs = [
-    dssi
-    fftwSinglePrec
-    ladspaH
-    ladspaPlugins
-    libjack2
-    liblo
-    liblrdf
-    libsamplerate
-    libsndfile
-    lirc
-    qtbase
-  ];
+    cmake qt4 pkgconfig ladspaPlugins ladspaH dssi liblo liblrdf fftwSinglePrec
+    libsndfile libsamplerate perl makedepend libjack2
+  ] ++ stdenv.lib.optional withLirc [ lirc ];
 
   enableParallelBuilding = true;
 
@@ -37,15 +25,11 @@ stdenv.mkDerivation (rec {
     homepage = http://www.rosegardenmusic.com/;
     description = "Music composition and editing environment";
     longDescription = ''
-      Rosegarden is a music composition and editing environment based around
-      a MIDI sequencer that features a rich understanding of music notation
-      and includes basic support for digital audio.
-
-      Rosegarden is an easy-to-learn, attractive application that runs on Linux,
-      ideal for composers, musicians, music students, and small studio or home
-      recording environments.
+      Rosegarden is a music composition and editing environment based around a MIDI sequencer that features a rich understanding of music notation and includes basic support for digital audio.
+      Rosegarden is an easy-to-learn, attractive application that runs on Linux, ideal for composers, musicians, music students, and small studio or home recording environments.
       '';
-    maintainers = with maintainers; [ lebastr ];
+
+    maintainers = [ maintainers.lebastr ];
     license = licenses.lgpl2Plus;
     platforms = platforms.linux;
   };

pkgs/applications/backup/deja-dup/default.nix

@@ -1,83 +0,0 @@
-{ stdenv, fetchurl, meson, ninja, pkgconfig, vala_0_38, gettext
-, gnome3, libnotify, intltool, itstool, glib, gtk3, libxml2
-, coreutils, libsecret, pcre, libxkbcommon, wrapGAppsHook
-, libpthreadstubs, libXdmcp, epoxy, at_spi2_core, dbus, libgpgerror
-, appstream-glib, desktop_file_utils, atk, pango, duplicity
-}:
-
-stdenv.mkDerivation rec {
-  name = "deja-dup-${version}";
-  version = "36.1";
-
-  src = fetchurl {
-    url = "https://launchpad.net/deja-dup/36/${version}/+download/deja-dup-${version}.tar.xz";
-    sha256 = "1s48k2sxrpwkzp37s4x7934lyg5194c47nv9ks15rksd5s0alnld";
-  };
-
-  patches = [
-    ./fix-paths.patch
-  ];
-
-  postPatch = ''
-    substituteInPlace libdeja/tools/duplicity/DuplicityInstance.vala --replace \
-      "/bin/rm" \
-      "${coreutils}/bin/rm"
-  '';
-
-  # couldn't find gio/gdesktopappinfo.h
-  NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";
-
-  nativeBuildInputs = [
-    meson ninja pkgconfig vala_0_38 gettext intltool itstool
-    appstream-glib desktop_file_utils libxml2 wrapGAppsHook
-  ];
-
-  buildInputs = [
-   libnotify gnome3.libpeas glib gtk3 libsecret
-   pcre libxkbcommon libpthreadstubs libXdmcp epoxy gnome3.nautilus
-   at_spi2_core dbus gnome3.gnome_online_accounts libgpgerror
-  ];
-
-  propagatedUserEnvPkgs = [ duplicity ];
-
-  postInstall = ''
-    glib-compile-schemas $out/share/glib-2.0/schemas
-  '';
-
-  # Manual rpath definition until https://github.com/mesonbuild/meson/issues/314 is fixed
-  postFixup =
-    let
-      rpath = stdenv.lib.makeLibraryPath [
-        glib
-        gtk3
-        gnome3.gnome_online_accounts
-        gnome3.libpeas
-        gnome3.nautilus
-        libgpgerror
-        libsecret
-        # Transitive
-        atk
-        pango
-      ];
-    in ''
-      # Unwrap accidentally wrapped library
-      mv $out/libexec/deja-dup/tools/.libduplicity.so-wrapped $out/libexec/deja-dup/tools/libduplicity.so
-
-      for elf in "$out"/bin/.*-wrapped "$out"/libexec/deja-dup/.deja-dup-monitor-wrapped "$out"/libexec/deja-dup/tools/*.so "$out"/lib/deja-dup/*.so "$out"/lib/nautilus/extensions-3.0/*.so; do
-        patchelf --set-rpath '${rpath}':"$out/lib/deja-dup" "$elf"
-      done
-    '';
-
-  meta = with stdenv.lib; {
-    description = "A simple backup tool";
-    longDescription = ''
-      Déjà Dup is a simple backup tool. It hides the complexity \
-      of backing up the Right Way (encrypted, off-site, and regular) \
-      and uses duplicity as the backend.
-    '';
-    homepage = https://launchpad.net/deja-dup;
-    license = with licenses; gpl3;
-    maintainers = with maintainers; [ jtojnar ];
-    platforms = with platforms; linux;
-  };
-}

pkgs/applications/backup/deja-dup/fix-paths.patch

@@ -1,12 +0,0 @@
-diff --git a/deja-dup/nautilus/meson.build b/deja-dup/nautilus/meson.build
-index 04b136f3..ed8f7cba 100644
---- a/deja-dup/nautilus/meson.build
-+++ b/deja-dup/nautilus/meson.build
-@@ -31,6 +31,6 @@ shared_module('deja-dup', ['NautilusExtension.c'],
-     link_with: [dirhandling],
-     dependencies: [nautilus_dep],
-     install: true,
--    install_dir: nautilus_dep.get_pkgconfig_variable('extensiondir'))
-+    install_dir: join_paths(get_option('libdir'), 'nautilus', 'extensions-3.0'))
- 
- endif

pkgs/applications/editors/android-studio/packages.nix

@@ -27,9 +27,9 @@ in rec {
 
   preview = mkStudio rec {
     pname = "android-studio-preview";
-    version = "3.0.0.15"; # "Android Studio 3.0 Beta 7"
-    build = "171.4365657";
-    sha256Hash = "0am3rq0ag982ik95mpcxvx2zlv0h4l6747b29mlsbqih66868db6";
+    version = "3.0.0.12"; # "Android Studio 3.0 Beta 4"
+    build = "171.4304935";
+    sha256Hash = "127ys250m1gdglj5y2qzxl73kh5qb4zlwyf79as7765mmcfcikn5";
 
     meta = stable.meta // {
       description = "The Official IDE for Android (preview version)";

pkgs/applications/editors/aseprite/default.nix

@@ -11,7 +11,7 @@
 
 stdenv.mkDerivation rec {
   name = "aseprite-${version}";
-  version = if unfree then "1.2.2" else "1.1.7";
+  version = if unfree then "1.2-beta12" else "1.1.7";
 
   src = fetchFromGitHub {
     owner = "aseprite";
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
     rev = "v${version}";
     fetchSubmodules = true;
     sha256 = if unfree
-      then "1ldi7zikl1g6rq3g9lkypx5wqzza5j0054j1r8bh7lyvb0szicig"
+      then "1zgsr03d4vwdj2qyiwfwfqsbqngp85n13i3xwbkfkbja036c5yhc"
       else "0gd49lns2bpzbkwax5jf9x1xmg1j8ij997kcxr2596cwiswnw4di";
   };
 
@@ -30,10 +30,6 @@ stdenv.mkDerivation rec {
     libX11 libXext libXcursor libXxf86vm
   ] ++ lib.optionals unfree [ cmark ];
 
-  postPatch = ''
-    sed -i src/config.h -e "s-\\(#define VERSION\\) .*-\\1 \"$version\"-"
-  '';
-
   cmakeFlags = [
     "-DENABLE_UPDATER=OFF"
     "-DUSE_SHARED_CURL=ON"

pkgs/applications/editors/atom/default.nix

@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "atom-${version}";
-  version = "1.20.1";
+  version = "1.20.0";
 
   src = fetchurl {
     url = "https://github.com/atom/atom/releases/download/v${version}/atom-amd64.deb";
-    sha256 = "0mr82m3yv18ljai3r4ncr65bqhjwxyf1si77iza4ijk5zv1llp7i";
+    sha256 = "1jzpa44ny78djdxc8d2w4jz1m68xmi8bzq87q3wmdffa4g9z4aa0";
     name = "${name}.deb";
   };
 

pkgs/applications/editors/eclipse/plugins.nix

@@ -447,28 +447,6 @@ rec {
     };
   };
 
-  vrapper = buildEclipseUpdateSite rec {
-    name = "vrapper-${version}";
-    version = "0.72.0";
-    owner = "vrapper";
-    repo = "vrapper";
-    date = "20170311";
-
-    src = fetchzip {
-      stripRoot = false;
-      url = "https://github.com/${owner}/${repo}/releases/download/${version}/vrapper_${version}_${date}.zip";
-      sha256 = "0nyirf6km97q211cxfy01kidxac20m8ba3kk9xj73ykrhsk3cxjp";
-    };
-
-    meta = with stdenv.lib; {
-      homepage = "https://github.com/vrapper/vrapper";
-      description = "A wrapper to provide a Vim-like input scheme for moving around and editing text";
-      license = licenses.gpl3;
-      platforms = platforms.all;
-      maintainers = [ maintainers.stumoss ];
-    };
-  };
-
   yedit = buildEclipsePlugin rec {
     name = "yedit-${version}";
     version = "1.0.20.201509041456";

pkgs/applications/editors/emacs-modes/melpa-generated.nix

@@ -10171,27 +10171,6 @@
           license = lib.licenses.free;
         };
       }) {};
-    company-lean = callPackage ({ company, dash, dash-functional, emacs, f, fetchFromGitHub, fetchurl, lean-mode, lib, melpaBuild, s }:
-    melpaBuild {
-        pname = "company-lean";
-        version = "20170920.708";
-        src = fetchFromGitHub {
-          owner = "leanprover";
-          repo = "lean-mode";
-          rev = "fa75bf97442a42e76e77fcf1b3c64e58f4f4169a";
-          sha256 = "1qyg0yjfmpnj8y3bbip3mvlhmh0ccm0j0p3crmb3az84fycvrsnr";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/42f4d6438c8aeb94ebc1782f2f5e2abd17f0ffde/recipes/company-lean";
-          sha256 = "1hqkn7w5dyznf7i3r3132q8x31r74q188jsm5kdrjqgbwak2p91a";
-          name = "company-lean";
-        };
-        packageRequires = [ company dash dash-functional emacs f lean-mode s ];
-        meta = {
-          homepage = "https://melpa.org/#/company-lean";
-          license = lib.licenses.free;
-        };
-      }) {};
     company-lua = callPackage ({ company, f, fetchFromGitHub, fetchurl, lib, lua-mode, melpaBuild, s }:
     melpaBuild {
         pname = "company-lua";
@@ -32743,27 +32722,6 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-lean = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, helm, lean-mode, lib, melpaBuild }:
-    melpaBuild {
-        pname = "helm-lean";
-        version = "20170919.934";
-        src = fetchFromGitHub {
-          owner = "leanprover";
-          repo = "lean-mode";
-          rev = "fa75bf97442a42e76e77fcf1b3c64e58f4f4169a";
-          sha256 = "1qyg0yjfmpnj8y3bbip3mvlhmh0ccm0j0p3crmb3az84fycvrsnr";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/42f4d6438c8aeb94ebc1782f2f5e2abd17f0ffde/recipes/helm-lean";
-          sha256 = "0j5ax14lhlyd9mpqk1jwh7nfp090kj71r045v2qjfaw2fa23b7si";
-          name = "helm-lean";
-        };
-        packageRequires = [ dash emacs helm lean-mode ];
-        meta = {
-          homepage = "https://melpa.org/#/helm-lean";
-          license = lib.licenses.free;
-        };
-      }) {};
     helm-lobsters = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-lobsters";
@@ -41673,27 +41631,6 @@
           license = lib.licenses.free;
         };
       }) {};
-    lean-mode = callPackage ({ dash, dash-functional, emacs, f, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, s }:
-    melpaBuild {
-        pname = "lean-mode";
-        version = "20170920.755";
-        src = fetchFromGitHub {
-          owner = "leanprover";
-          repo = "lean-mode";
-          rev = "fa75bf97442a42e76e77fcf1b3c64e58f4f4169a";
-          sha256 = "1qyg0yjfmpnj8y3bbip3mvlhmh0ccm0j0p3crmb3az84fycvrsnr";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/42f4d6438c8aeb94ebc1782f2f5e2abd17f0ffde/recipes/lean-mode";
-          sha256 = "0rdraxsirkrzbinjwg4qam15iy3qiixqgwsckngzw8d9a4s9l6sj";
-          name = "lean-mode";
-        };
-        packageRequires = [ dash dash-functional emacs f flycheck s ];
-        meta = {
-          homepage = "https://melpa.org/#/lean-mode";
-          license = lib.licenses.free;
-        };
-      }) {};
     leanote = callPackage ({ async, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, pcache, request, s }:
     melpaBuild {
         pname = "leanote";

pkgs/applications/editors/focuswriter/default.nix

@@ -1,27 +1,25 @@
-{ stdenv, fetchurl, pkgconfig, qmake, qttools, hunspell, qtbase, qtmultimedia }:
+{ stdenv, fetchurl, qt4, qmake4Hook, pkgconfig, hunspell }:
 
 stdenv.mkDerivation rec {
   name = "focuswriter-${version}";
-  version = "1.6.7";
+  version = "1.5.3";
 
   src = fetchurl {
-    url = "https://gottcode.org/focuswriter/focuswriter-${version}-src.tar.bz2";
-    sha256 = "10rqzinr6yd6ca06rklg34kdc08a3xgygfzmprsfg7gdsybfay5z";
+    url = http://gottcode.org/focuswriter/focuswriter-1.5.3-src.tar.bz2;
+    sha256 = "1i58jxbiy95ijf81g8c3gwxhcg3irzssna3wv7vhrd57g4lcfj0w";
   };
 
-  nativeBuildInputs = [ pkgconfig qmake qttools ];
-  buildInputs = [ hunspell qtbase qtmultimedia ];
-
-  enableParallelBuilding = true;
+  buildInputs = [ qt4 qmake4Hook pkgconfig hunspell ];
   
   qmakeFlags = [ "PREFIX=/" ];
+
   installFlags = [ "INSTALL_ROOT=$(out)" ];
 
-  meta = with stdenv.lib; {
+  meta = {
     description = "Simple, distraction-free writing environment";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ madjar ];
-    platforms = platforms.all;
+    license = stdenv.lib.licenses.gpl2;
+    maintainers = [ stdenv.lib.maintainers.madjar ];
+    platforms = stdenv.lib.platforms.all;
     homepage = https://gottcode.org/focuswriter/;
   };
 }

pkgs/applications/graphics/dia/default.nix

@@ -1,43 +1,50 @@
-{ stdenv, fetchgit, autoconf, automake, libtool, gtk2, pkgconfig, perl,
-perlXMLParser, libxml2, gettext, python, libxml2Python, docbook5, docbook_xsl,
-libxslt, intltool, libart_lgpl, withGNOME ? false, libgnomeui,
-gtk-mac-integration }:
+{stdenv, fetchurl, gtk2, pkgconfig, perl, perlXMLParser, libxml2, gettext
+, python, libxml2Python, docbook5, docbook_xsl, libxslt, intltool, libart_lgpl
+, withGNOME ? false, libgnomeui }:
 
 stdenv.mkDerivation rec {
-  name = "dia-${version}";
-  version = "0.97.3.20170622";
+  name = "dia-${minVer}.3";
+  minVer = "0.97";
 
-  src = fetchgit {
-    url = git://git.gnome.org/dia;
-    rev = "b86085dfe2b048a2d37d587adf8ceba6fb8bc43c";
-    sha256 = "1fyxfrzdcs6blxhkw3bcgkksaf3byrsj4cbyrqgb4869k3ynap96";
+  src = fetchurl {
+    url = "mirror://gnome/sources/dia/${minVer}/${name}.tar.xz";
+    sha256 = "0d3x6w0l6fwd0l8xx06y1h56xf8ss31yzia3a6xr9y28xx44x492";
+  };
+
+  correctPersistence = fetchurl {
+    url = https://launchpadlibrarian.net/132677658/persistence;
+    sha256 = "1rv6zv9i03bna4bdp1wzn72lg7kdwi900y1izdq0imibi54nxjsk";
   };
 
   buildInputs =
     [ gtk2 perlXMLParser libxml2 gettext python libxml2Python docbook5
-      libxslt docbook_xsl libart_lgpl ]
-      ++ stdenv.lib.optional withGNOME libgnomeui
-      ++ stdenv.lib.optional stdenv.isDarwin gtk-mac-integration;
+      libxslt docbook_xsl libart_lgpl
+    ] ++ stdenv.lib.optional withGNOME libgnomeui;
 
-  nativeBuildInputs = [ autoconf automake libtool pkgconfig intltool perl ];
+  nativeBuildInputs = [ pkgconfig intltool perl ];
 
-  preConfigure = ''
-    NOCONFIGURE=1 ./autogen.sh # autoreconfHook is not enough
-  '';
   configureFlags = stdenv.lib.optionalString withGNOME "--enable-gnome";
 
-  hardeningDisable = [ "format" ];
+  patches = [ ];
 
   # This file should normally require a gtk-update-icon-cache -q /usr/share/icons/hicolor command
   # It have no reasons to exist in a redistribuable package
   postInstall = ''
     rm $out/share/icons/hicolor/icon-theme.cache
+
+    cd "$out"/bin/
+    mv dia .dia-wrapped
+    echo '#! ${stdenv.shell}' >> dia
+    echo 'test -f "$HOME/.dia/persistence" || cp ${correctPersistence} "$HOME/.dia/persistence" ' >> dia
+    echo 'chmod u+rw "$HOME/.dia/persistence" ' >> dia
+    echo "\"$out/bin/"'.dia-wrapped" "$@"' >> dia
+    chmod a+x dia
   '';
 
   meta = {
     description = "Gnome Diagram drawing software";
     homepage = http://live.gnome.org/Dia;
     maintainers = with stdenv.lib.maintainers; [raskin];
-    platforms = stdenv.lib.platforms.unix;
+    platforms = stdenv.lib.platforms.linux;
   };
 }

pkgs/applications/graphics/gcolor3/default.nix

@@ -1,31 +0,0 @@
-{ stdenv, fetchFromGitHub, gnome3, libtool, intltool, pkgconfig, gtk3, hicolor_icon_theme, wrapGAppsHook } :
-
-let
-  version = "2.2";
-in stdenv.mkDerivation {
-  name = "gcolor3-${version}";
-
-  src = fetchFromGitHub {
-    owner = "hjdskes";
-    repo = "gcolor3";
-    rev = "v${version}";
-    sha256 = "1rbahsi33pfggpj5cigy6wy5333g3rpm8v2q0b35c6m7pwhmf2gr";
-  };
-
-  nativeBuildInputs = [ gnome3.gnome_common libtool intltool pkgconfig hicolor_icon_theme wrapGAppsHook ];
-
-  buildInputs = [ gtk3 ];
-
-  configureScript = "./autogen.sh";
-
-  # clang-4.0: error: argument unused during compilation: '-pthread'
-  NIX_CFLAGS_COMPILE = stdenv.lib.optional stdenv.cc.isClang "-Wno-error=unused-command-line-argument";
-
-  meta = {
-    description = "A simple color chooser written in GTK3";
-    homepage = https://hjdskes.github.io/projects/gcolor3/;
-    license = stdenv.lib.licenses.gpl2;
-    maintainers = with stdenv.lib.maintainers; [ jtojnar ];
-    platforms = stdenv.lib.platforms.unix;
-  };
-}

pkgs/applications/graphics/kgraphviewer/default.nix

@@ -1,38 +1,24 @@
-{ stdenv, mkDerivation, fetchurl, cmake, extra-cmake-modules, pkgconfig, wrapGAppsHook
-, kconfig, kcrash, kinit, kdoctools, kiconthemes, kio, kparts, kwidgetsaddons
-, qtbase, qtsvg
-, boost, graphviz
+{ stdenv, fetchurl, automoc4, cmake, gettext, perl, pkgconfig
+, kdelibs4, boost, graphviz
 }:
 
-mkDerivation rec {
+stdenv.mkDerivation rec {
   name = "kgraphviewer-${version}";
-  version = "2.4.2";
+  version = "2.2.0";
 
   src = fetchurl {
-    url = "mirror://kde/stable/kgraphviewer/${version}/${name}.tar.xz";
-    sha256 = "1jc5zfgy4narwgn7rscfwz7l5pjy0jghal6yb3kd4sfadi78nhs9";
+    url = "mirror://kde/stable/kgraphviewer/${version}/src/${name}.tar.xz";
+    sha256 = "1vs5x539mx26xqdljwzkh2bj7s3ydw4cb1wm9nlhgs18siw4gjl5";
   };
 
-  buildInputs = [
-    qtbase qtsvg
-    boost graphviz
-  ];
-
-  nativeBuildInputs = [
-    cmake extra-cmake-modules pkgconfig wrapGAppsHook
-    kdoctools
-  ];
-
-  propagatedBuildInputs = [
-    kconfig kinit kio kparts kwidgetsaddons
-  ];
-
-  enableParallelBuilding = true;
+  buildInputs = [ kdelibs4 boost graphviz ];
+  nativeBuildInputs = [ automoc4 cmake gettext perl pkgconfig ];
 
   meta = with stdenv.lib; {
     description = "A Graphviz dot graph viewer for KDE";
     license = licenses.gpl2;
-    maintainers = with maintainers; [ lethalman ];
     platforms = platforms.linux;
+    maintainers = [ maintainers.lethalman ];
   };
 }
+

pkgs/applications/graphics/sane/backends/brscan4/default.nix

@@ -10,17 +10,17 @@ let
   udevRules = callPackage ./udev_rules_type1.nix {};
 
 in stdenv.mkDerivation rec {
-  name = "brscan4-0.4.4-4";
+  name = "brscan4-0.4.4-2";
   src = 
     if stdenv.system == "i686-linux" then
       fetchurl {
         url = "http://download.brother.com/welcome/dlf006646/${name}.i386.deb";
-        sha256 = "13mhjbzf9nvpdzrc2s98684r7likg76zxs1wlz2h8w59fsqgx4k2";
+        sha256 = "1rd6qmg49lvack8rg9kkqs3vxfvvqf2x45h93pkrhk8a4aj5c8ll";
       }
     else if stdenv.system == "x86_64-linux" then
       fetchurl {
         url = "http://download.brother.com/welcome/dlf006645/${name}.amd64.deb";
-        sha256 = "0xy5px96y1saq9l80vwvfn6anr2q42qlxdhm6ci2a0diwib5q9fd";
+        sha256 = "1r3cq1k2a2bghibkckmk00x7y59ic31gv7jcsw7380szf1j3la59";
       }
     else throw "${name} is not supported on ${stdenv.system} (only i686-linux and x86_64 linux are supported)";
 

pkgs/applications/graphics/xzgv/default.nix

@@ -1,23 +1,22 @@
-{ stdenv, fetchurl, gtk2, libexif, pkgconfig, texinfo }:
+{ stdenv, fetchurl, gtk2, pkgconfig, texinfo }:
 
 stdenv.mkDerivation rec {
   name = "xzgv-${version}";
-  version = "0.9.2";
+  version = "0.9.1";
   src = fetchurl {
     url = "mirror://sourceforge/xzgv/xzgv-${version}.tar.gz";
-    sha256 = "17l1xr9v07ggwga3vn0z1i4lnwjrr20rr8z1kjbw71aaijxl18i5";
+    sha256 = "1rh432wnvzs434knzbda0fslhfx0gngryrrnqkfm6gwd2g5mxcph";
   };
-  nativeBuildInputs = [ pkgconfig texinfo ];
-  buildInputs = [ gtk2 libexif ];
+  buildInputs = [ gtk2 pkgconfig texinfo ];
+  patches = [ ./fix-linker-paths.patch ];
   postPatch = ''
     substituteInPlace config.mk \
       --replace /usr/local $out
+    substituteInPlace config.mk \
+      --replace "CFLAGS=-O2 -Wall" "CFLAGS=-Wall"
     substituteInPlace Makefile \
       --replace "all: src man" "all: src man info"
   '';
-  preInstall = ''
-    mkdir -p $out/share/{app-install/desktop,applications,info,pixmaps}
-  '';
   meta = with stdenv.lib; {
     homepage = http://sourceforge.net/projects/xzgv/;
     description = "Picture viewer for X with a thumbnail-based selector";

pkgs/applications/graphics/xzgv/fix-linker-paths.patch

@@ -0,0 +1,25 @@
+taken from http://sourceforge.net/p/xzgv/code/53/tree//trunk/xzgv/src/Makefile?diff=514dada434309d2ec11f5eff:52
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -9,8 +9,10 @@
+ # This gets definitions for CC, CFLAGS, BINDIR etc.
+ include ../config.mk
+ 
+-CFLAGS+=`pkg-config --cflags gtk+-2.0` `pkg-config --cflags gdk-pixbuf-2.0`
+-LDFLAGS+=`pkg-config --libs gtk+-2.0` `pkg-config --libs gdk-pixbuf-2.0`
++CFLAGS+=`pkg-config --cflags gtk+-2.0` `pkg-config --cflags gdk-pixbuf-2.0` \
++	`pkg-config --cflags x11`
++LDFLAGS+=`pkg-config --libs gtk+-2.0` `pkg-config --libs gdk-pixbuf-2.0` \
++	`pkg-config --libs x11` -lm
+ 
+ all: xzgv
+ 
+@@ -23,7 +25,7 @@
+ 	backend.o
+ 
+ xzgv: $(OBJS)
+-	$(CC) $(LDFLAGS) -o xzgv $(OBJS)
++	$(CC) -o xzgv $(OBJS) $(LDFLAGS)
+ 
+ installdirs:
+ 	/bin/sh ../mkinstalldirs $(BINDIR)

pkgs/applications/kde/default.nix

@@ -135,7 +135,6 @@ let
       libkipi = callPackage ./libkipi.nix {};
       libkleo = callPackage ./libkleo.nix {};
       libkomparediff2 = callPackage ./libkomparediff2.nix {};
-      libksane = callPackage ./libksane.nix {};
       libksieve = callPackage ./libksieve.nix {};
       mailcommon = callPackage ./mailcommon.nix {};
       mailimporter = callPackage ./mailimporter.nix {};

pkgs/applications/kde/libksane.nix

@@ -1,16 +0,0 @@
-{
-  mkDerivation, lib,
-  extra-cmake-modules, qtbase,
-  ki18n, ktextwidgets, kwallet, kwidgetsaddons,
-  sane-backends
-}:
-
-mkDerivation {
-  name = "libksane";
-  meta = with lib; {
-    license = licenses.gpl2;
-    maintainers = with maintainers; [ pshendry ];
-  };
-  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ qtbase ki18n ktextwidgets kwallet kwidgetsaddons sane-backends ];
-}

pkgs/applications/misc/chirp/default.nix

@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   name = "chirp-daily-${version}";
-  version = "20170714";
+  version = "20170311";
 
   src = fetchurl {
     url = "http://trac.chirp.danplanet.com/chirp_daily/daily-${version}/${name}.tar.gz";
-    sha256 = "1pglsmc0pf50w7df4vv30z5hmdxy4aqjl3qrv8kfiax7rld21gcy";
+    sha256 = "0mvj650vm3bfk94b174gl99fj4jigrx38f1iciz1cp3gn8hcrcpj";
   };
 
   nativeBuildInputs = [ makeWrapper ];

pkgs/applications/misc/electrum-dash/default.nix

@@ -13,7 +13,7 @@ python2Packages.buildPythonApplication rec {
     dns
     ecdsa
     pbkdf2
-    protobuf
+    protobuf3_2
     pyasn1
     pyasn1-modules
     pycrypto

pkgs/applications/misc/electrum-ltc/default.nix

@@ -20,7 +20,7 @@ python2Packages.buildPythonApplication rec {
     requests
     qrcode
     ltc_scrypt
-    protobuf
+    protobuf3_2
     dns
     jsonrpclib
   ];

pkgs/applications/misc/electrum/default.nix

@@ -14,7 +14,7 @@ python2Packages.buildPythonApplication rec {
     ecdsa
     jsonrpclib
     pbkdf2
-    protobuf
+    protobuf3_2
     pyaes
     pycrypto
     pyqt4

pkgs/applications/misc/far2l/default.nix

@@ -3,15 +3,15 @@
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
-  rev = "1ecd3a37c7b866a4599c547ea332541de2a2af26";
-  build = "unstable-2017-09-30.git${builtins.substring 0 7 rev}";
+  rev = "73e52ccbc7626631b6898c7324413ee1fc09bc0e";
+  build = "unstable-2017-09-25.git${builtins.substring 0 7 rev}";
   name = "far2l-2.1.${build}";
 
   src = fetchFromGitHub {
     owner = "elfmz";
     repo = "far2l";
     rev = rev;
-    sha256 = "0mavg9z1n81b1hbkj320m36r8lpw28j07rl1d2hpg69y768yyq05";
+    sha256 = "0pg1l2k5ycm6whr39gshpbgw62v51rfz3ddi6qhcx0nyzxcrczy5";
   };
 
   nativeBuildInputs = [ cmake pkgconfig m4 makeWrapper imagemagick ];

pkgs/applications/misc/googler/default.nix

@@ -1,25 +0,0 @@
-{stdenv, fetchFromGitHub, python}:
-
-stdenv.mkDerivation rec {
-  version = "3.3";
-  name = "googler-${version}";
-
-  src = fetchFromGitHub {
-    owner = "jarun";
-    repo = "googler";
-    rev = "v${version}";
-    sha256 = "0gkzgcf0qss7fskgswryk835vivlv1f99ym1pbxy3vv9wcwx6a43";
-  };
-
-  propagatedBuildInputs = [ python ];
-
-  makeFlags = "PREFIX=$(out)";
-
-  meta = with stdenv.lib; {
-    homepage = https://github.com/jarun/googler;
-    description = "Google Search, Google Site Search, Google News from the terminal";
-    license = licenses.gpl3;
-    maintainers = with maintainers; [ koral ];
-    platforms = platforms.unix;
-  };
-}

pkgs/applications/misc/gpx-viewer/default.nix

@@ -1,33 +0,0 @@
-{ stdenv, fetchurl, intltool, pkgconfig, gnome3, shared_mime_info, desktop_file_utils, wrapGAppsHook }:
-
-stdenv.mkDerivation rec {
-  name = "gpx-viewer-${version}";
-  version = "0.4.0";
-
-  src = fetchurl {
-    url = "https://launchpad.net/gpx-viewer/trunk/${version}/+download/${name}.tar.gz";
-    sha256 = "956acfaf870ac436300cd9953dece630df7fd7dff8e4ae2577a6002884466f80";
-  };
-
-  patches = fetchurl {
-    url = "https://code.launchpad.net/~chkr/gpx-viewer/gtk3-bugfix/+merge/260766/+preview-diff/628965/+files/preview.diff";
-    sha256 = "1yl7jk7skkcx10nny5zdixswcymjd9s9c1zhm1i5y3aqhchvmfs7";
-  };
-  patchFlags = [ "-p0" ];
-
-  nativeBuildInputs = [
-    intltool pkgconfig
-    shared_mime_info # For update-mime-database
-    desktop_file_utils # For update-desktop-database
-    wrapGAppsHook # Fix error: GLib-GIO-ERROR **: No GSettings schemas are installed on the system
-  ];
-  buildInputs = with gnome3; [ gdl libchamplain defaultIconTheme ];
-
-  meta = with stdenv.lib; {
-    homepage = https://blog.sarine.nl/tag/gpxviewer/;
-    description = "Simple tool to visualize tracks and waypoints stored in a gpx file";
-    platforms = with platforms; linux;
-    license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ dotlambda ];
-  };
-}

pkgs/applications/misc/josm/default.nix

@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "josm-${version}";
-  version = "12914";
+  version = "12712";
 
   src = fetchurl {
     url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar";
-    sha256 = "104yih9xfgkpcqg8sqgwkpij2l6pwm12jx6kif45j11sg7hxlh8x";
+    sha256 = "0lpz4yzkvjpn5g36nibrkh773jnlkiqj6lghsx69i86h0xfb7gqf";
   };
 
   buildInputs = [ jre8 makeWrapper ];

pkgs/applications/misc/k2pdfopt/default.nix

@@ -95,6 +95,7 @@ stdenv.mkDerivation rec {
     license = licenses.gpl3;
     platforms = platforms.linux;
     maintainers = with maintainers; [ bosu danielfullmer ];
+    broken = true;
   };
 }
 

pkgs/applications/misc/kupfer/default.nix

@@ -1,66 +0,0 @@
-{ stdenv
-, makeWrapper
-, fetchurl
-, intltool
-, python3Packages
-, gtk3
-, dbus
-, libwnck3
-, keybinder3
-, hicolor_icon_theme
-, wrapGAppsHook
-}:
-
-with python3Packages;
-
-buildPythonApplication rec {
-  name = "kupfer-${version}";
-  version = "319";
-
-  src = fetchurl {
-    url = "https://github.com/kupferlauncher/kupfer/releases/download/v${version}/kupfer-v${version}.tar.xz";
-    sha256 = "0c9xjx13r8ckfr4az116bhxsd3pk78v04c3lz6lqhraak0rp4d92";
-  };
-
-  nativeBuildInputs = [ wrapGAppsHook intltool ];
-  buildInputs = [ hicolor_icon_theme docutils libwnck3 keybinder3 ];
-  propagatedBuildInputs = [ pygobject3 gtk3 pyxdg dbus-python pycairo ];
-
-  configurePhase = ''
-    runHook preConfigure
-    python ./waf configure --prefix=$prefix
-    runHook postConfigure
-  '';
-
-  buildPhase = ''
-    runHook preBuild
-    python ./waf
-    runHook postBuild
-  '';
-
-  installPhase = let
-    pythonPath = (stdenv.lib.concatMapStringsSep ":"
-      (m: "${m}/lib/${python.libPrefix}/site-packages")
-      propagatedBuildInputs);
-  in ''
-    runHook preInstall
-    python ./waf install
-
-    gappsWrapperArgs+=(
-      "--prefix" "PYTHONPATH" : "${pythonPath}"
-      "--set" "PYTHONNOUSERSITE" "1"
-    )
-
-    runHook postInstall
-  '';
-
-  doCheck = false; # no tests
-
-  meta = with stdenv.lib; {
-    description = "A smart, quick launcher";
-    homepage    = "https://kupferlauncher.github.io/";
-    license     = licenses.gpl3;
-    maintainers = with maintainers; [ cobbal ];
-    platforms   = platforms.linux;
-  };
-}

pkgs/applications/misc/merkaartor/default.nix

@@ -1,27 +1,25 @@
-{ stdenv, fetchFromGitHub, qmake, pkgconfig, boost, gdal, proj
-, qtbase, qtsvg, qtwebkit }:
+{ stdenv, fetchFromGitHub, qt4, qmake4Hook, boost, proj, gdal, sqlite, pkgconfig }:
 
 stdenv.mkDerivation rec {
   name = "merkaartor-${version}";
-  version = "0.18.3";
+  version = "0.18.2";
 
   src = fetchFromGitHub {
     owner = "openstreetmap";
     repo = "merkaartor";
     rev = version;
-    sha256 = "0ls3q8m1hxiwyrypy6qca8wczhl4969ncl0sszfdwfv70rzxjk88";
+    sha256 = "1a8kzrc9w0b2a2zgw9dbbi15jy9ynv6nf2sg3k4dbh7f1s2ajx9l";
   };
 
-  nativeBuildInputs = [ qmake pkgconfig ];
+  buildInputs = [ qt4 boost proj gdal sqlite ];
 
-  buildInputs = [ boost gdal proj qtbase qtsvg qtwebkit ];
+  nativeBuildInputs = [ qmake4Hook pkgconfig ];
 
-  enableParallelBuilding = true;
-
-  meta = with stdenv.lib; {
-    description = "OpenStreetMap editor";
-    homepage = http://merkaartor.be/;
-    license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ viric ];
+  meta = {
+    description = "An openstreetmap editor";
+    homepage = http://merkaartor.org/;
+    license = stdenv.lib.licenses.gpl2Plus;
+    maintainers = with stdenv.lib.maintainers; [viric];
+    inherit (qt4.meta) platforms;
   };
 }

pkgs/applications/misc/octoprint/default.nix

@@ -91,8 +91,6 @@ in pythonPackages.buildPythonApplication rec {
       -e 's,psutil>=[^"]*,psutil,g' \
       -e 's,requests>=[^"]*,requests,g' \
       -e 's,future>=[^"]*,future,g' \
-      -e 's,pyserial>=[^"]*,pyserial,g' \
-      -e 's,semantic_version>=[^"]*,semantic_version,g' \
       setup.py
   '';
 

pkgs/applications/misc/ola/default.nix

@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, autoreconfHook, bison, flex, pkgconfig
-, libuuid, cppunit, protobuf3_1, zlib, avahi, libmicrohttpd
+, libuuid, cppunit, protobuf, zlib, avahi, libmicrohttpd
 , perl, python3, python3Packages
 }:
 
@@ -15,8 +15,8 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ autoreconfHook bison flex pkgconfig perl ];
-  buildInputs = [ libuuid cppunit protobuf3_1 zlib avahi libmicrohttpd python3 ];
-  propagatedBuildInputs = [ python3Packages.protobuf3_1 python3Packages.numpy ];
+  buildInputs = [ libuuid cppunit protobuf zlib avahi libmicrohttpd python3 ];
+  propagatedBuildInputs = with python3Packages; [ protobuf3_2 numpy ];
 
   configureFlags = [ "--enable-python-libs" ];
 

pkgs/applications/misc/pcmanx-gtk2/default.nix

@@ -17,7 +17,7 @@ stdenv.mkDerivation {
     homepage = http://pcman.ptt.cc;
     license = licenses.gpl2;
     description = "Telnet BBS browser with GTK+ interface";
-    maintainers = [ maintainers.sifmelcara ];
+    maintainers = [ maintainers.mingchuan ];
     platforms = platforms.linux;
   };
 }

pkgs/applications/misc/pytrainer/default.nix

@@ -1,45 +1,38 @@
-{ stdenv, fetchFromGitHub, perl, python2Packages, sqlite, gpsbabel
-, withWebKit ? false }:
+{ stdenv, fetchurl, pythonPackages, sqlite, gpsbabel }:
 
 let
 
   # Pytrainer needs a matplotlib with GTK backend. Also ensure we are
   # using the pygtk with glade support as needed by pytrainer.
-  matplotlibGtk = python2Packages.matplotlib.override {
+  matplotlibGtk = pythonPackages.matplotlib.override {
     enableGtk2 = true;
-    pygtk = python2Packages.pyGtkGlade;
+    pygtk = pythonPackages.pyGtkGlade;
   };
 
 in
 
-python2Packages.buildPythonApplication rec {
+pythonPackages.buildPythonApplication rec {
   name = "pytrainer-${version}";
-  version = "1.11.0";
+  version = "1.10.0";
 
-  src = fetchFromGitHub {
-    owner = "pytrainer";
-    repo = "pytrainer";
-    rev = "v${version}";
-    sha256 = "1x4f1ydjql0aisvxs5kyi9lx35b4q3768dx42fyzq1nxdwzaqyvy";
+  src = fetchurl {
+    url = "https://github.com/pytrainer/pytrainer/archive/v${version}.tar.gz";
+    sha256 = "0l42p630qhymgrcvxgry8chrpzcp6nr3d1vd7vhifh2npfq9l09y";
   };
 
   namePrefix = "";
 
-  patches = [
-    # The test fails in the UTC timezone and C locale.
-    ./fix-test-tz.patch
-
   # The existing use of pywebkitgtk shows raw HTML text instead of
   # map. This patch solves the problems by showing the file from a
   # string, which allows setting an explicit MIME type.
-    ./pytrainer-webkit.patch
+  patches = [ ./pytrainer-webkit.patch ];
+
+  propagatedBuildInputs = with pythonPackages; [
+    dateutil lxml matplotlibGtk pyGtkGlade pywebkitgtk
+    sqlalchemy_migrate
   ];
 
-  propagatedBuildInputs = with python2Packages; [
-    dateutil lxml matplotlibGtk pyGtkGlade sqlalchemy_migrate
-  ] ++ stdenv.lib.optional withWebKit [ pywebkitgtk ];
-
-  buildInputs = [ perl gpsbabel sqlite ];
+  buildInputs = [ gpsbabel sqlite ];
 
   # This package contains no binaries to patch or strip.
   dontPatchELF = true;

pkgs/applications/misc/pytrainer/fix-test-tz.patch

@@ -1,33 +0,0 @@
-diff -Nurp pytrainer-v1.11.0-a/pytrainer/test/core/test_activity.py pytrainer-v1.11.0-b/pytrainer/test/core/test_activity.py
---- pytrainer-v1.11.0-a/pytrainer/test/core/test_activity.py	1980-01-02 00:00:00.000000000 +0100
-+++ pytrainer-v1.11.0-b/pytrainer/test/core/test_activity.py	2017-09-30 18:56:43.127016847 +0200
-@@ -69,7 +69,7 @@ class ActivityTest(unittest.TestCase):
-         self.assertEquals(self.activity.time, self.activity.duration)
- 
-     def test_activity_starttime(self):
--        self.assertEquals(self.activity.starttime, '12:58:23 PM')
-+        self.assertEquals(self.activity.starttime, '12:58:23')
- 
-     def test_activity_time_tuple(self):
-         self.assertEquals(self.activity.time_tuple, (2, 3, 46))
-diff -Nurp pytrainer-v1.11.0-a/pytrainer/test/imports/test_garmintcxv2.py pytrainer-v1.11.0-b/pytrainer/test/imports/test_garmintcxv2.py
---- pytrainer-v1.11.0-a/pytrainer/test/imports/test_garmintcxv2.py	1980-01-02 00:00:00.000000000 +0100
-+++ pytrainer-v1.11.0-b/pytrainer/test/imports/test_garmintcxv2.py	2017-09-30 18:55:45.078128980 +0200
-@@ -23,7 +23,7 @@ class GarminTCXv2Test(unittest.TestCase)
-             self.fail()
- 
-     def test_workout_summary(self):
--        summary = [(0, False, '2012-10-14T12:02:42', '10.12', '00:39:51', 'Running')]
-+        summary = [(0, False, '2012-10-14T10:02:42', '10.12', '00:39:51', 'Running')]
-         try:
-             current_path = os.path.dirname(os.path.abspath(__file__))
-             data_path = os.path.dirname(os.path.dirname(os.path.dirname(current_path))) + "/"
-diff -Nurp pytrainer-v1.11.0-a/pytrainer/test/lib/test_date.py pytrainer-v1.11.0-b/pytrainer/test/lib/test_date.py
---- pytrainer-v1.11.0-a/pytrainer/test/lib/test_date.py	1980-01-02 00:00:00.000000000 +0100
-+++ pytrainer-v1.11.0-b/pytrainer/test/lib/test_date.py	2017-09-30 18:56:23.448720166 +0200
-@@ -45,4 +45,4 @@ class DateFunctionTest(unittest.TestCase
-     def test_getDateTime(self):
-         utctime, localtime = getDateTime('Tue Nov 24 17:29:05 UTC 2015')
-         self.assertEqual(datetime.datetime(2015, 11, 24, 17, 29, 5, tzinfo=tzutc()), utctime)
--        self.assertEqual(datetime.datetime(2015, 11, 24, 19, 29, 5, tzinfo=tzlocal()), localtime)
-+        self.assertEqual(datetime.datetime(2015, 11, 24, 17, 29, 5, tzinfo=tzlocal()), localtime)

pkgs/applications/misc/qmapshack/default.nix

@@ -1,33 +0,0 @@
-{ stdenv, fetchFromBitbucket, cmake, qtscript, qtwebkit, gdal, proj, routino, quazip }:
-
-stdenv.mkDerivation rec {
-  name = "qmapshack-${version}";
-  version = "1.9.1";
-
-  src = fetchFromBitbucket {
-    owner = "maproom";
-    repo = "qmapshack";
-    rev = "V%20${version}";
-    sha256 = "1yswdq1s9jjhwb3wfiy3kkiiaqzagw28vjqvl13jxcnmq7y763sr";
-  };
-
-  nativeBuildInputs = [ cmake ];
-
-  buildInputs = [ qtscript qtwebkit gdal proj routino quazip ];
-
-  cmakeFlags = [
-    "-DROUTINO_XML_PATH=${routino}/share/routino"
-    "-DQUAZIP_INCLUDE_DIR=${quazip}/include/quazip"
-    "-DLIBQUAZIP_LIBRARY=${quazip}/lib/libquazip.so"
-  ];
-
-  enableParallelBuilding = true;
-
-  meta = with stdenv.lib; {
-    homepage = https://bitbucket.org/maproom/qmapshack/wiki/Home;
-    description = "Plan your next outdoor trip";
-    license = licenses.gpl3;
-    maintainter = with maintainers; [ dotlambda ];
-    platforms = with platforms; linux;
-  };
-}

pkgs/applications/misc/rescuetime/default.nix

@@ -9,14 +9,14 @@ let
     } else fetchurl {
       name = "rescuetime-installer.deb";
       url = "https://www.rescuetime.com/installers/rescuetime_current_amd64.deb";
-      sha256 = "1xjwaqz0gs12ndgw7c2f1nkvj0nqcl0bxhd54pwk0dwrx9pn9avz";
+      sha256 = "161f71kvcrilv9qxldwn8xsqs2g9c2f2g9wb5brbfc0lqbbc8n89";
     };
 
 in
 
 stdenv.mkDerivation {
   # https://www.rescuetime.com/updates/linux_release_notes.html
-  name = "rescuetime-2.9.11.1300";
+  name = "rescuetime-2.9.11.1285";
   inherit src;
   buildInputs = [ dpkg makeWrapper ];
   unpackPhase = ''

pkgs/applications/misc/robo3t/default.nix

@@ -1,77 +0,0 @@
-{ stdenv, fetchurl, zlib, glib, xorg, dbus, fontconfig,
-  freetype, xkeyboard_config, makeDesktopItem, makeWrapper }:
-
-stdenv.mkDerivation rec {
-  name = "robo3t-${version}";
-  version = "1.1.1";
-
-  src = fetchurl {
-    url = "https://download.robomongo.org/1.1.1/linux/robo3t-${version}-linux-x86_64-c93c6b0.tar.gz";
-    sha256 = "140cn80vg7c8vpdjasqi4b3kyqj4n033lcm3ikz5674x3jr7r5zs";
-  };
-
-  icon = fetchurl {
-    url = "https://github.com/Studio3T/robomongo/raw/${version}/trash/install/linux/robomongo.png";
-    sha256 = "15li8536x600kkfkb3h6mw7y0f2ljkv951pc45dpiw036vldibv2";
-  };
-
-  desktopItem = makeDesktopItem {
-    name = "Robo3T";
-    exec = "robo3t";
-    icon = icon;
-    comment = "Query GUI for mongodb";
-    desktopName = "Robo3T";
-    genericName = "MongoDB management tool";
-    categories = "Development;IDE;mongodb;";
-  };
-
-  nativeBuildInputs = [makeWrapper];
-
-  ldLibraryPath = stdenv.lib.makeLibraryPath [
-    stdenv.cc.cc
-    zlib
-    glib
-    xorg.libXi
-    xorg.libxcb
-    xorg.libXrender
-    xorg.libX11
-    xorg.libSM
-    xorg.libICE
-    xorg.libXext
-    dbus
-    fontconfig
-    freetype
-  ];
-
-  installPhase = ''
-    BASEDIR=$out/lib/robo3t
-
-    mkdir -p $BASEDIR/bin
-    cp bin/* $BASEDIR/bin
-
-    mkdir -p $BASEDIR/lib
-    cp -r lib/* $BASEDIR/lib
-
-    mkdir -p $out/share/applications
-    cp $desktopItem/share/applications/* $out/share/applications
-
-    mkdir -p $out/share/icons
-    cp ${icon} $out/share/icons/robomongo.png
-
-    patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux-x86-64.so.2 $BASEDIR/bin/robo3t
-
-    mkdir $out/bin
-
-    makeWrapper $BASEDIR/bin/robo3t $out/bin/robo3t \
-      --suffix LD_LIBRARY_PATH : ${ldLibraryPath} \
-      --suffix QT_XKB_CONFIG_ROOT : ${xkeyboard_config}/share/X11/xkb
-  '';
-
-  meta = {
-    homepage = https://robomongo.org/;
-    description = "Query GUI for mongodb";
-    platforms = stdenv.lib.intersectLists stdenv.lib.platforms.linux stdenv.lib.platforms.x86_64;
-    license = stdenv.lib.licenses.gpl3;
-    maintainers = [ stdenv.lib.maintainers.eperuffo ];
-  };
-}

pkgs/applications/misc/stupidterm/default.nix

@@ -1,36 +0,0 @@
-{ stdenv, fetchFromGitHub, pkgconfig, vte, gtk }:
-
-stdenv.mkDerivation rec {
-  name = "stupidterm-2017-03-15";
-
-  nativeBuildInputs = [ pkgconfig ];
-
-  buildInputs = [ vte gtk ];
-
-  src = fetchFromGitHub {
-    owner = "esmil";
-    repo = "stupidterm";
-    rev = "752316a783f52317ffd9f05d32e208dbcafc5ba6";
-    sha256 = "1d8fyhr9sgpxgkwzkyiws0kvhmqfwwyycvcr1qf2wjldiax222lv";
-  };
-
-  makeFlags = "PKGCONFIG=${pkgconfig}/bin/pkg-config binary=stupidterm";
-
-  installPhase = ''
-    mkdir -p $out/bin $out/share/applications $out/share/stupidterm
-    cp stupidterm $out/bin
-    substituteAll ${./stupidterm.desktop} $out/share/applications/stupidterm.desktop
-    substituteAll stupidterm.ini $out/share/stupidterm/stupidterm.ini
-  '';
-
-  meta = with stdenv.lib; {
-    description = "Simple wrapper around the VTE terminal emulator widget for GTK+";
-    longDescription = ''
-      Simple wrapper around the VTE terminal emulator widget for GTK+
-    '';
-    homepage = https://github.com/esmil/stupidterm;
-    license = licenses.lgpl3Plus;
-    maintainers = [ maintainers.etu ];
-    platforms = platforms.linux;
-  };
-}

pkgs/applications/misc/stupidterm/stupidterm.desktop

@@ -1,9 +0,0 @@
-[Desktop Entry]
-Version=20170315
-Name=stupidterm
-Comment=VTE based terminal emulator
-Exec=stupidterm
-Icon=utilities-terminal
-Terminal=false
-Type=Application
-Categories=System;TerminalEmulator;