From 1dca2fba7f814a7803dbb40e17a80f8ec4e522cb Mon Sep 17 00:00:00 2001
From: Robert Scott <code@humanleg.org.uk>
Date: Sat, 25 Jul 2015 15:40:29 +0100
Subject: [PATCH 01/23] apache-httpd: update minor versions of both 2.2 and 2.4
 for security-related fixes

---
 pkgs/servers/http/apache-httpd/2.2.nix | 4 ++--
 pkgs/servers/http/apache-httpd/2.4.nix | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/servers/http/apache-httpd/2.2.nix b/pkgs/servers/http/apache-httpd/2.2.nix
index 2af7b761c24a..99d6fe12aa1c 100644
--- a/pkgs/servers/http/apache-httpd/2.2.nix
+++ b/pkgs/servers/http/apache-httpd/2.2.nix
@@ -12,12 +12,12 @@ assert ldapSupport -> aprutil.ldapSupport && openldap != null;
 assert mpm == "prefork" || mpm == "worker" || mpm == "event";
 
 stdenv.mkDerivation rec {
-  version = "2.2.29";
+  version = "2.2.31";
   name = "apache-httpd-${version}";
 
   src = fetchurl {
     url = "mirror://apache/httpd/httpd-${version}.tar.bz2";
-    sha1 = "1d6a8fbc1391d358cc6fe430edc16222b97258d5";
+    sha256 = "1b165zi7jrrlz5wmyy3b34lcs3dl4g0dymfb0qxwdnimylcrsbzk";
   };
 
   buildInputs = [perl apr aprutil pcre] ++
diff --git a/pkgs/servers/http/apache-httpd/2.4.nix b/pkgs/servers/http/apache-httpd/2.4.nix
index cb550652b785..29f8a9621c9e 100644
--- a/pkgs/servers/http/apache-httpd/2.4.nix
+++ b/pkgs/servers/http/apache-httpd/2.4.nix
@@ -14,12 +14,12 @@ assert sslSupport -> aprutil.sslSupport && openssl != null;
 assert ldapSupport -> aprutil.ldapSupport && openldap != null;
 
 stdenv.mkDerivation rec {
-  version = "2.4.12";
+  version = "2.4.16";
   name = "apache-httpd-${version}";
 
   src = fetchurl {
     url = "mirror://apache/httpd/httpd-${version}.tar.bz2";
-    sha256 = "1r7a63ka41vlswrqbb21vall6sc7svwgd497kb6dh8a6zvnkjvdd";
+    sha256 = "0hrpy6gjwma0kba7p7m61vwh82qcnkf08123lrwpg257m93hnrmc";
   };
 
   buildInputs = [perl] ++

From 8129a404f4935626c40360158b9014346d8c3450 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Mon, 27 Jul 2015 16:47:15 +0200
Subject: [PATCH 02/23] gnome3: override libsoup with gnomeSupport = true

Fix Gnome 3 packages broken by fc1077c.
---
 pkgs/desktops/gnome-3/3.16/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/desktops/gnome-3/3.16/default.nix b/pkgs/desktops/gnome-3/3.16/default.nix
index da5ae3f02a10..67236ae202bb 100644
--- a/pkgs/desktops/gnome-3/3.16/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/default.nix
@@ -34,8 +34,9 @@ let
 
   gamesPackages = with gnome3; [ swell-foop lightsoff iagno ];
 
-  inherit (pkgs) libsoup glib gtk2 webkitgtk24x gtk3 gtkmm3 libcanberra;
+  inherit (pkgs) glib gtk2 webkitgtk24x gtk3 gtkmm3 libcanberra;
   inherit (pkgs.gnome2) ORBit2;
+  libsoup = pkgs.libsoup.override { gnomeSupport = true; };
   orbit = ORBit2;
   gnome3 = self // { recurseForDerivations = false; };
   clutter = pkgs.clutter_1_22;

From 923dda992bcf629e8301beec7f04dfbbd40bb0e9 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Sun, 26 Jul 2015 23:34:06 +0200
Subject: [PATCH 03/23] ecj: require jdk7 instead of jdk

The ecj build fails in Java 8 due to backwards incompatible changes in
the `javax.lang.model` namespace so with this change we specifically ask
for a JDK for Java 7.
---
 pkgs/development/eclipse/ecj/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/eclipse/ecj/default.nix b/pkgs/development/eclipse/ecj/default.nix
index 19ec3a3a2fb5..b6bee8aead02 100644
--- a/pkgs/development/eclipse/ecj/default.nix
+++ b/pkgs/development/eclipse/ecj/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, unzip, ant, jdk, makeWrapper }:
+{ stdenv, fetchurl, unzip, ant, jdk7, makeWrapper }:
 
 let
   version = "3.7.2";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
     sha256 = "0swyysbyfmv068x8q1c5jqpwk5zb4xahg17aypx5rwb660f8fpbm";
   };
 
-  buildInputs = [ unzip ant jdk makeWrapper ];
+  buildInputs = [ unzip ant jdk7 makeWrapper ];
 
   unpackPhase = ''
     mkdir "${name}"
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
     cp -v *.jar $out/share/java
 
     mkdir -pv $out/bin
-    makeWrapper ${jdk.jre}/bin/java $out/bin/ecj \
+    makeWrapper ${jdk7.jre}/bin/java $out/bin/ecj \
       --add-flags "-cp $out/share/java/ecj.jar org.eclipse.jdt.internal.compiler.batch.Main"
 
     # Add a setup hook that causes Ant to use the ECJ.

From 4984bfe807e1ccce807cf1fce24ba232260d27df Mon Sep 17 00:00:00 2001
From: Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>
Date: Mon, 27 Jul 2015 16:46:25 +0100
Subject: [PATCH 04/23] redshift: fix evaluation

Broken by 77d33f77d7cffa9e53c780398ae0fadc8dd0eda5 , cc @nckx
---
 nixos/modules/services/x11/redshift.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/x11/redshift.nix b/nixos/modules/services/x11/redshift.nix
index f164b47fc869..4f39e05f0f8d 100644
--- a/nixos/modules/services/x11/redshift.nix
+++ b/nixos/modules/services/x11/redshift.nix
@@ -67,7 +67,7 @@ in {
           -l ${cfg.latitude}:${cfg.longitude} \
           -t ${toString cfg.temperature.day}:${toString cfg.temperature.night} \
           -b ${toString cfg.brightness.day}:${toString cfg.brightness.night} \
-          ${cfg.extraOptions}
+          ${lib.strings.concatStringsSep " " cfg.extraOptions}
       '';
       environment = { DISPLAY = ":0"; };
       serviceConfig.Restart = "always";

From fa0b84c446a75b3cc9e95323bd9fc7b0cd324794 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Mon, 27 Jul 2015 09:24:33 -0700
Subject: [PATCH 05/23] iproute: Fix reference to /etc instead of /etc at
 runtime

---
 pkgs/os-specific/linux/iproute/default.nix | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/iproute/default.nix b/pkgs/os-specific/linux/iproute/default.nix
index 15e25861f275..be928fa16e1d 100644
--- a/pkgs/os-specific/linux/iproute/default.nix
+++ b/pkgs/os-specific/linux/iproute/default.nix
@@ -19,11 +19,18 @@ stdenv.mkDerivation rec {
     "DESTDIR="
     "LIBDIR=$(out)/lib"
     "SBINDIR=$(out)/sbin"
-    "CONFDIR=$(out)/etc"
     "DOCDIR=$(out)/share/doc/${name}"
     "MANDIR=$(out)/share/man"
   ];
 
+  buildFlags = [
+    "CONFDIR=/etc"
+  ];
+
+  installFlags = [
+    "CONFDIR=$(out)/etc"
+  ];
+
   buildInputs = [ db iptables ];
   nativeBuildInputs = [ bison flex pkgconfig ];
 

From 5792b1345a64aea6c359ab06fee996fbdcc194fa Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Mon, 27 Jul 2015 09:24:49 -0700
Subject: [PATCH 06/23] iproute: Actually don't install docs

---
 pkgs/os-specific/linux/iproute/default.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/os-specific/linux/iproute/default.nix b/pkgs/os-specific/linux/iproute/default.nix
index be928fa16e1d..09e5f1bc5ce3 100644
--- a/pkgs/os-specific/linux/iproute/default.nix
+++ b/pkgs/os-specific/linux/iproute/default.nix
@@ -19,8 +19,8 @@ stdenv.mkDerivation rec {
     "DESTDIR="
     "LIBDIR=$(out)/lib"
     "SBINDIR=$(out)/sbin"
-    "DOCDIR=$(out)/share/doc/${name}"
     "MANDIR=$(out)/share/man"
+    "DOCDIR=$(TMPDIR)/share/doc/${name}" # Don't install docs
   ];
 
   buildFlags = [
@@ -36,9 +36,6 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  # Get rid of useless TeX/SGML docs.
-  postInstall = "rm -rf $out/share/doc";
-
   meta = with stdenv.lib; {
     homepage = http://www.linuxfoundation.org/collaborate/workgroups/networking/iproute2;
     description = "A collection of utilities for controlling TCP/IP networking and traffic control in Linux";

From 6f1b2e7de2e631cddeb446736dd72771246629ef Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@gmail.com>
Date: Mon, 27 Jul 2015 13:28:34 -0300
Subject: [PATCH 07/23] Lightning: 2.0.5 -> 2.1.0

---
 pkgs/development/libraries/lightning/default.nix | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/libraries/lightning/default.nix b/pkgs/development/libraries/lightning/default.nix
index 036d9c61d07a..3805e8c1ce84 100644
--- a/pkgs/development/libraries/lightning/default.nix
+++ b/pkgs/development/libraries/lightning/default.nix
@@ -1,14 +1,17 @@
-{ fetchurl, stdenv, binutils }:
+{ stdenv, fetchurl, binutils }:
 
+with stdenv.lib;
 stdenv.mkDerivation rec {
-  name = "lightning-2.0.5";
+
+  name = "lightning-${version}";
+  version = "2.1.0";
 
   src = fetchurl {
     url = "mirror://gnu/lightning/${name}.tar.gz";
-    sha256 = "0jm9a8ddxc1v9hyzyv4ybg37fjac2yjqv1hkd262wxzqms36mdk5";
+    sha256 = "19j9nwl88k660045s40cbz5zrl1wpd2mcxnnc8qqnnaj311a58qz";
   };
 
-  # Needs libopcodes.so  from binutils for 'make check'
+  # Needs libopcodes.so from binutils for 'make check'
   buildInputs = [ binutils ];
 
   doCheck = true;
@@ -16,7 +19,6 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = http://www.gnu.org/software/lightning/;
     description = "Run-time code generation library";
-
     longDescription = ''
       GNU lightning is a library that generates assembly language code
       at run-time; it is very fast, making it ideal for Just-In-Time
@@ -24,7 +26,7 @@ stdenv.mkDerivation rec {
       to the clients a standardized RISC instruction set inspired by
       the MIPS and SPARC chips.
     '';
-
-    license = stdenv.lib.licenses.lgpl3Plus;
+    maintainers = [ maintainers.AndersonTorres ];
+    license = licenses.lgpl3Plus;
   };
 }

From a7bfe5643b0a53aab2bc578d4b527a59f01cc280 Mon Sep 17 00:00:00 2001
From: Jascha Geerds <jg@ekby.de>
Date: Mon, 27 Jul 2015 20:15:34 +0200
Subject: [PATCH 08/23] cups: Fix test by using different groff output

---
 nixos/tests/printing.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/tests/printing.nix b/nixos/tests/printing.nix
index b1c2e74136ce..0db9a529644b 100644
--- a/nixos/tests/printing.nix
+++ b/nixos/tests/printing.nix
@@ -60,8 +60,8 @@ import ./make-test.nix ({pkgs, ... }: {
       $client->succeed("lpq") =~ /DeskjetRemote is ready.*no entries/s or die;
 
       # Test printing various file types.
-      foreach my $file ("${pkgs.groff}/share/doc/*/examples/mom/penguin.pdf",
-                        "${pkgs.groff}/share/doc/*/meref.ps",
+      foreach my $file ("${pkgs.groff.doc}/share/doc/*/examples/mom/penguin.pdf",
+                        "${pkgs.groff.doc}/share/doc/*/meref.ps",
                         "${pkgs.cups}/share/doc/cups/images/cups.png",
                         "${pkgs.pcre}/share/doc/pcre/pcre.txt")
       {

From e3a5bca4ae3737dbe0ff2675d1fd77fdf72db609 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 27 Jul 2015 19:28:41 +0200
Subject: [PATCH 09/23] Require signed binary caches by default

---
 nixos/doc/manual/release-notes/rl-unstable.xml | 5 +++++
 nixos/modules/services/misc/nix-daemon.nix     | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/nixos/doc/manual/release-notes/rl-unstable.xml b/nixos/doc/manual/release-notes/rl-unstable.xml
index ecde80f2a01d..6ae8cd83d3f4 100644
--- a/nixos/doc/manual/release-notes/rl-unstable.xml
+++ b/nixos/doc/manual/release-notes/rl-unstable.xml
@@ -56,6 +56,11 @@ default, unless you have a non-empty
 <command>cron</command> to be enabled, set
 <option>services.cron.enable = true</option>.</para></listitem>
 
+<listitem><para>Nix now requires binary caches to be cryptographically
+signed. If you have unsigned binary caches that you want to continue
+to use, you should set <option>nix.requireSignedBinaryCaches =
+false</option>.</para></listitem>
+
 <listitem><para>Steam now doesn't need root rights to work. Instead of using
 <literal>*-steam-chrootenv</literal>, you should now just run <literal>steam</literal>.
 <literal>steamChrootEnv</literal> package was renamed to <literal>steam</literal>,
diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix
index b5a8a7df9fca..49286f512bb9 100644
--- a/nixos/modules/services/misc/nix-daemon.nix
+++ b/nixos/modules/services/misc/nix-daemon.nix
@@ -254,7 +254,7 @@ in
 
       requireSignedBinaryCaches = mkOption {
         type = types.bool;
-        default = false;
+        default = true;
         description = ''
           If enabled, Nix will only download binaries from binary
           caches if they are cryptographically signed with any of the

From d166c854b6ecfd9ada520439b06f7eb9e3e4be7c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 27 Jul 2015 19:46:36 +0200
Subject: [PATCH 10/23] Add option system.stateVersion

This option requests compatibility with older NixOS releases with
respect to stateful data, in cases where new releases have defaults
that might be incompatible with system state of existing NixOS
deployments. For instance, if we change the default version of
PostgreSQL, existing deployments will break if the new version can't
read databases created by the old version.

So for example, setting

  system.stateVersion = "15.07";

requests that options like services.postgresql.package use defaults
corresponding to the 15.07 release branch. Note that
nixos-generate-config emits this option. (In the future, NixOps may
set system.stateVersion to the NixOS release in use when the machine
was created.)

See also #7939 for another motivating example.
---
 .../installer/tools/nixos-generate-config.pl  |  3 +++
 nixos/modules/installer/tools/tools.nix       |  1 +
 nixos/modules/misc/version.nix                | 26 +++++++++++++++++--
 3 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/installer/tools/nixos-generate-config.pl b/nixos/modules/installer/tools/nixos-generate-config.pl
index 187ea7635eb5..9010478662cc 100644
--- a/nixos/modules/installer/tools/nixos-generate-config.pl
+++ b/nixos/modules/installer/tools/nixos-generate-config.pl
@@ -544,6 +544,9 @@ $bootLoaderConfig
   #   uid = 1000;
   # };
 
+  # The NixOS release to be compatible with for stateful data such as databases.
+  system.stateVersion = "@nixosRelease@";
+
 }
 EOF
     } else {
diff --git a/nixos/modules/installer/tools/tools.nix b/nixos/modules/installer/tools/tools.nix
index 99a74b6d59ed..61744c39d601 100644
--- a/nixos/modules/installer/tools/tools.nix
+++ b/nixos/modules/installer/tools/tools.nix
@@ -40,6 +40,7 @@ let
     src = ./nixos-generate-config.pl;
     path = [ pkgs.btrfsProgs ];
     perl = "${pkgs.perl}/bin/perl -I${pkgs.perlPackages.FileSlurp}/lib/perl5/site_perl";
+    inherit (config.system) nixosRelease;
   };
 
   nixos-option = makeProg {
diff --git a/nixos/modules/misc/version.nix b/nixos/modules/misc/version.nix
index 5afdcf214f27..8a52df42dd80 100644
--- a/nixos/modules/misc/version.nix
+++ b/nixos/modules/misc/version.nix
@@ -6,12 +6,35 @@ with lib;
 
   options = {
 
+    system.stateVersion = mkOption {
+      type = types.str;
+      default = config.system.nixosRelease;
+      description = ''
+        Every once in a while, a new NixOS release may change
+        configuration defaults in a way incompatible with stateful
+        data. For instance, if the default version of PostgreSQL
+        changes, the new version will probably be unable to read your
+        existing databases. To prevent such breakage, you can set the
+        value of this option to the NixOS release with which you want
+        to be compatible. The effect is that NixOS will option
+        defaults corresponding to the specified release (such as using
+        an older version of PostgreSQL).
+      '';
+    };
+
     system.nixosVersion = mkOption {
       internal = true;
       type = types.str;
       description = "NixOS version.";
     };
 
+    system.nixosRelease = mkOption {
+      internal = true;
+      type = types.str;
+      default = readFile "${toString pkgs.path}/.version";
+      description = "NixOS release.";
+    };
+
     system.nixosVersionSuffix = mkOption {
       internal = true;
       type = types.str;
@@ -41,8 +64,7 @@ with lib;
 
   config = {
 
-    system.nixosVersion =
-      mkDefault (readFile "${toString pkgs.path}/.version" + config.system.nixosVersionSuffix);
+    system.nixosVersion = mkDefault (config.system.nixosRelease + config.system.nixosVersionSuffix);
 
     system.nixosVersionSuffix =
       let suffixFile = "${toString pkgs.path}/.version-suffix"; in

From a5b83c357319c4442c94979cb3679d41d9b352bc Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 27 Jul 2015 20:13:08 +0200
Subject: [PATCH 11/23] sshd: Use RSA and ED25519 host keys

Closes #7939.
---
 nixos/doc/manual/release-notes/rl-unstable.xml | 13 +++++++++++++
 nixos/modules/services/networking/ssh/sshd.nix | 15 +++++----------
 2 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/nixos/doc/manual/release-notes/rl-unstable.xml b/nixos/doc/manual/release-notes/rl-unstable.xml
index 6ae8cd83d3f4..abfd417c53a7 100644
--- a/nixos/doc/manual/release-notes/rl-unstable.xml
+++ b/nixos/doc/manual/release-notes/rl-unstable.xml
@@ -50,6 +50,19 @@ following incompatible changes:
 
 <itemizedlist>
 
+<listitem><para><command>sshd</command> no longer supports DSA and ECDSA
+host keys by default. If you have existing systems with such host keys
+and want to continue to use them, please set
+
+<programlisting>
+system.stateVersion = "14.12";
+</programlisting>
+
+(The new option <option>system.stateVersion</option> ensures that
+certain configuration changes that could break existing systems (such
+as the <command>sshd</command> host key setting) will maintain
+compatibility with the specified NixOS release.)</para></listitem>
+
 <listitem><para><command>cron</command> is no longer enabled by
 default, unless you have a non-empty
 <option>services.cron.systemCronJobs</option>. To force
diff --git a/nixos/modules/services/networking/ssh/sshd.nix b/nixos/modules/services/networking/ssh/sshd.nix
index 4be2b5fe0c0c..1c428ceddfd2 100644
--- a/nixos/modules/services/networking/ssh/sshd.nix
+++ b/nixos/modules/services/networking/ssh/sshd.nix
@@ -184,16 +184,11 @@ in
       hostKeys = mkOption {
         type = types.listOf types.attrs;
         default =
-          [ { path = "/etc/ssh/ssh_host_dsa_key";
-              type = "dsa";
-            }
-            { path = "/etc/ssh/ssh_host_ecdsa_key";
-              type = "ecdsa";
-              bits = 521;
-            }
-            { path = "/etc/ssh/ssh_host_ed25519_key";
-              type = "ed25519";
-            }
+          [ { type = "rsa"; bits = 4096; path = "/etc/ssh/ssh_host_rsa_key"; }
+            { type = "ed25519"; path = "/etc/ssh/ssh_host_ed25519_key"; }
+          ] ++ optionals (!versionAtLeast config.system.stateVersion "15.07")
+          [ { type = "dsa"; path = "/etc/ssh/ssh_host_dsa_key"; }
+            { type = "ecdsa"; bits = 521; path = "/etc/ssh/ssh_host_ecdsa_key"; }
           ];
         description = ''
           NixOS can automatically generate SSH host keys.  This option

From ace332eb36fd537c9a2674d591fd5e723f8fcb62 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 27 Jul 2015 20:26:19 +0200
Subject: [PATCH 12/23] Set a default value for services.postgresql.package
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This is finally possible now that we have ‘system.stateVersion’
(allowing the default package to change over time).
---
 nixos/modules/services/databases/postgresql.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/nixos/modules/services/databases/postgresql.nix b/nixos/modules/services/databases/postgresql.nix
index 4cff2818f3bf..bae088c6610e 100644
--- a/nixos/modules/services/databases/postgresql.nix
+++ b/nixos/modules/services/databases/postgresql.nix
@@ -154,6 +154,12 @@ in
 
   config = mkIf config.services.postgresql.enable {
 
+    services.postgresql.package =
+      # Note: when changing the default, make it conditional on
+      # ‘system.stateVersion’ to maintain compatibility with existing
+      # systems!
+      mkDefault pkgs.postgresql94;
+
     services.postgresql.authentication = mkAfter
       ''
         # Generated file; do not edit!

From 8e7ecd6de6b21c273cc406a02c4c45848cb8f931 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Mon, 27 Jul 2015 13:04:39 -0700
Subject: [PATCH 13/23] rethinkdb: 2.0.3 -> 2.0.4

---
 pkgs/servers/nosql/rethinkdb/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/nosql/rethinkdb/default.nix b/pkgs/servers/nosql/rethinkdb/default.nix
index 2f47d542d00e..cbf0d5bf183a 100644
--- a/pkgs/servers/nosql/rethinkdb/default.nix
+++ b/pkgs/servers/nosql/rethinkdb/default.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   name = "rethinkdb-${version}";
-  version = "2.0.3";
+  version = "2.0.4";
 
   src = fetchurl {
     url = "http://download.rethinkdb.com/dist/${name}.tgz";
-    sha256 = "1580h5clkw8kprdb9waaf8al3wa2vj5d2l2m394r91fq45ss23sd";
+    sha256 = "19qhia4lfa8a0rzp2v6lnlxp2lf4z4vqhgfxnicfdnx07q4r847i";
   };
 
   preConfigure = ''

From 6e2103068d6a8de3780b5e9ca275b0d6d548e979 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Mon, 27 Jul 2015 13:04:20 -0700
Subject: [PATCH 14/23] exempi: Use default boost

---
 pkgs/development/libraries/exempi/default.nix | 4 +++-
 pkgs/top-level/all-packages.nix               | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/exempi/default.nix b/pkgs/development/libraries/exempi/default.nix
index e941f0f65476..e7a3bd495132 100644
--- a/pkgs/development/libraries/exempi/default.nix
+++ b/pkgs/development/libraries/exempi/default.nix
@@ -8,7 +8,9 @@ stdenv.mkDerivation rec {
     sha256 = "01vcd1mfn2s0iiq2cjyzgvnxx6kcq9cwra1iipijhs0vwvjx0yhf";
   };
 
-  configureFlags = [ "--with-boost=${boost.dev}" ];
+  configureFlags = [
+    "--with-boost=${boost.dev}"
+  ];
 
   buildInputs = [ expat zlib boost ];
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e7f93aedfc2c..8f6b88cbef5a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1415,7 +1415,7 @@ let
 
   evtest = callPackage ../applications/misc/evtest { };
 
-  exempi = callPackage ../development/libraries/exempi { boost = boost155; };
+  exempi = callPackage ../development/libraries/exempi { };
 
   execline = callPackage ../tools/misc/execline { };
 

From 5b0a676d5b29ed1586a18cb35ed508ec48600a8f Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Mon, 27 Jul 2015 13:06:00 -0700
Subject: [PATCH 15/23] rethinkdb: Remove pin on boost 1.55 and remove gperf
 dependency

---
 pkgs/servers/nosql/rethinkdb/default.nix | 14 ++++++++++----
 pkgs/top-level/all-packages.nix          |  4 +---
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/pkgs/servers/nosql/rethinkdb/default.nix b/pkgs/servers/nosql/rethinkdb/default.nix
index cbf0d5bf183a..789aa95b1577 100644
--- a/pkgs/servers/nosql/rethinkdb/default.nix
+++ b/pkgs/servers/nosql/rethinkdb/default.nix
@@ -1,5 +1,6 @@
-{ stdenv, fetchurl, which, protobuf, gperftools
-, boost, zlib, curl, python, m4, icu, jemalloc }:
+{ stdenv, fetchurl, which, m4, python
+, protobuf, boost, zlib, curl, openssl, icu, jemalloc
+}:
 
 stdenv.mkDerivation rec {
   name = "rethinkdb-${version}";
@@ -15,12 +16,17 @@ stdenv.mkDerivation rec {
     patchShebangs .
   '';
 
-  configureFlags = "--lib-path ${gperftools}/lib --lib-path ${jemalloc}/lib";
+  configureFlags = [
+    "--with-jemalloc"
+    "--lib-path=${jemalloc}/lib"
+  ];
 
-  buildInputs = [ protobuf boost zlib curl icu jemalloc ];
+  buildInputs = [ protobuf boost zlib curl openssl icu jemalloc ];
 
   nativeBuildInputs = [ which m4 python ];
 
+  enableParallelBuilding = true;
+
   meta = {
     description = "An open-source distributed database built with love";
     longDescription = ''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8f6b88cbef5a..5fecb610f96b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9161,9 +9161,7 @@ let
 
   restund = callPackage ../servers/restund {};
 
-  rethinkdb = callPackage ../servers/nosql/rethinkdb {
-    boost = boost155;
-  };
+  rethinkdb = callPackage ../servers/nosql/rethinkdb { };
 
   rippled = callPackage ../servers/rippled {
     boost = boost157;

From cb78f09038660ca98a3107b530cbd8c90a088735 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Mon, 27 Jul 2015 13:12:06 -0700
Subject: [PATCH 16/23] libreoffice: Remove uneeded commented reference to
 boost155

---
 pkgs/top-level/all-packages.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5fecb610f96b..db608b65420c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11857,7 +11857,6 @@ let
     inherit (perlPackages) ArchiveZip CompressZlib;
     inherit (gnome) GConf ORBit2 gnome_vfs;
     zip = zip.override { enableNLS = false; };
-    #boost = boost155;
     #glm = glm_0954;
     bluez5 = bluez5_28;
     fontsConf = makeFontsConf {

From 67c186a7eafcb356b0ef72c66005643842f78cd7 Mon Sep 17 00:00:00 2001
From: Eduard Bachmakov <e.bachmakov@gmail.com>
Date: Sun, 26 Jul 2015 20:00:34 -0400
Subject: [PATCH 17/23] Add current alpha of protobuf 3

---
 pkgs/development/libraries/protobuf/3.0.nix | 12 ++++++++++++
 pkgs/top-level/all-packages.nix             |  1 +
 2 files changed, 13 insertions(+)
 create mode 100644 pkgs/development/libraries/protobuf/3.0.nix

diff --git a/pkgs/development/libraries/protobuf/3.0.nix b/pkgs/development/libraries/protobuf/3.0.nix
new file mode 100644
index 000000000000..900c9dc5a512
--- /dev/null
+++ b/pkgs/development/libraries/protobuf/3.0.nix
@@ -0,0 +1,12 @@
+{ callPackage, fetchFromGitHub, ... } @ args:
+
+callPackage ./generic.nix (args // rec {
+  version = "3.0.0-alpha-3.1";
+  # make sure you test also -A pythonPackages.protobuf
+  src = fetchFromGitHub {
+    owner = "google";
+    repo = "protobuf";
+    rev = "v${version}";
+    sha256 = "0vzw20ymjmjrrmg84f822qslclsb2q0wf0qdj2da198gmkkbrw45";
+  };
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7889e5c334d8..ec914ad8070a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7847,6 +7847,7 @@ let
   postgis = callPackage ../development/libraries/postgis { };
 
   protobuf = protobuf2_6;
+  protobuf3_0 = lowPrio (callPackage ../development/libraries/protobuf/3.0.nix { });
   protobuf2_6 = callPackage ../development/libraries/protobuf/2.6.nix { };
   protobuf2_5 = callPackage ../development/libraries/protobuf/2.5.nix { };
 

From 32105552233dc068e0af29568e6b934722e385b3 Mon Sep 17 00:00:00 2001
From: Moritz Ulrich <moritz@tarn-vedra.de>
Date: Sat, 25 Jul 2015 00:40:35 +0200
Subject: [PATCH 18/23] Chirp: New package.

---
 pkgs/applications/misc/chirp/default.nix | 41 ++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix          |  4 +++
 2 files changed, 45 insertions(+)
 create mode 100644 pkgs/applications/misc/chirp/default.nix

diff --git a/pkgs/applications/misc/chirp/default.nix b/pkgs/applications/misc/chirp/default.nix
new file mode 100644
index 000000000000..2b92dc8d19e9
--- /dev/null
+++ b/pkgs/applications/misc/chirp/default.nix
@@ -0,0 +1,41 @@
+{ stdenv, fetchurl, libxml2Python, libxslt, makeWrapper
+, python, pyserial, pygtk
+}:
+let
+  version = "0.4.1";
+in
+stdenv.mkDerivation rec {
+  name = "chirp-${version}";
+  inherit version;
+
+  src = fetchurl {
+    url = "http://chirp.danplanet.com/download/0.4.1/chirp-${version}.tar.gz";
+    sha256 = "17iihghqjprn2hld193qw0yl1kkrf6m0fp57l7ibkflxr0nnb7cc";
+  };
+
+  buildInputs = [
+    makeWrapper
+    pyserial pygtk libxml2Python libxslt pyserial
+  ];
+
+  phases = [ "unpackPhase" "installPhase" "fixupPhase" ];
+
+  installPhase = ''
+    mkdir -p $out/bin $out/share/chirp
+    cp -r . $out/share/chirp/
+    ln -s $out/share/chirp/chirpw $out/bin/chirpw
+
+    for file in "$out"/bin/*; do
+      wrapProgram "$file" \
+        --prefix PYTHONPATH : $PYTHONPATH:$(toPythonPath "$out")
+    done
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A free, open-source tool for programming your amateur radio.";
+    homepage = http://chirp.danplanet.com/;
+    license = licenses.gpl3;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.the-kenny ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4c317e182517..265343cd490d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10829,6 +10829,10 @@ let
 
   chatzilla = callPackage ../applications/networking/irc/chatzilla { };
 
+  chirp = callPackage ../applications/misc/chirp {
+    inherit (pythonPackages) pyserial pygtk;
+  };
+
   chromium = callPackage ../applications/networking/browsers/chromium {
     channel = "stable";
     pulseSupport = config.pulseaudio or true;

From 92c17a71297b6d4f629e735b92f974daa23df72b Mon Sep 17 00:00:00 2001
From: Moritz Ulrich <moritz@tarn-vedra.de>
Date: Mon, 27 Jul 2015 13:00:39 +0200
Subject: [PATCH 19/23] hackrf: 2014.08.1 -> 2015.07.2.

---
 pkgs/applications/misc/hackrf/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/misc/hackrf/default.nix b/pkgs/applications/misc/hackrf/default.nix
index 806392f717fc..b815884a29cb 100644
--- a/pkgs/applications/misc/hackrf/default.nix
+++ b/pkgs/applications/misc/hackrf/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   name = "hackrf-${version}";
-  version = "2014.08.1";
+  version = "2015.07.2";
 
   src = fetchgit {
     url = "git://github.com/mossmann/hackrf";
     rev = "refs/tags/v${version}";
-    sha256 = "1f3mmzyn6qqbl02h6dkz0zybppihqgpdxjgqmkb1pn3i0d98ydb3";
+    sha256 = "0wa4m0kdq8q2ib724w8ry8shmmm1liaaawhjygrjx6zxz9jxr3vm";
   };
 
   buildInputs = [
@@ -23,6 +23,6 @@ stdenv.mkDerivation rec {
     homepage = http://greatscottgadgets.com/hackrf/;
     license = licenses.gpl2;
     platforms = platforms.linux;
-    maintainers = [ maintainers.sjmackenzie ];
+    maintainers = with maintainers; [ sjmackenzie the-kenny ];
   };
 }

From 2f861a3d0782f15efb7b49a38f26c4abbd374d7f Mon Sep 17 00:00:00 2001
From: Moritz Ulrich <moritz@tarn-vedra.de>
Date: Mon, 27 Jul 2015 13:01:48 +0200
Subject: [PATCH 20/23] gqrx: Add support for hackrf.

---
 pkgs/applications/misc/gqrx/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/gqrx/default.nix b/pkgs/applications/misc/gqrx/default.nix
index 440d2b790c21..7d320cc938a2 100644
--- a/pkgs/applications/misc/gqrx/default.nix
+++ b/pkgs/applications/misc/gqrx/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, qt4, gnuradio, boost, gnuradio-osmosdr
 # drivers (optional):
-, rtl-sdr
+, rtl-sdr, hackrf
 , pulseaudioSupport ? true, libpulseaudio
 }:
 
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [
-    qt4 gnuradio boost gnuradio-osmosdr rtl-sdr
+    qt4 gnuradio boost gnuradio-osmosdr rtl-sdr hackrf
   ] ++ stdenv.lib.optionals pulseaudioSupport [ libpulseaudio ];
 
   configurePhase = ''qmake PREFIX="$out"'';

From 0391b7b0a8d5cff0311ec7dd238e5d679b5290da Mon Sep 17 00:00:00 2001
From: Moritz Ulrich <moritz@tarn-vedra.de>
Date: Mon, 27 Jul 2015 13:02:12 +0200
Subject: [PATCH 21/23] gnuradio-osmosdr & gqrx: Add myself as maintainer.

---
 pkgs/applications/misc/gnuradio-osmosdr/default.nix | 2 +-
 pkgs/applications/misc/gqrx/default.nix             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/gnuradio-osmosdr/default.nix b/pkgs/applications/misc/gnuradio-osmosdr/default.nix
index 360d98537ccf..5fc6eb2c2744 100644
--- a/pkgs/applications/misc/gnuradio-osmosdr/default.nix
+++ b/pkgs/applications/misc/gnuradio-osmosdr/default.nix
@@ -30,6 +30,6 @@ stdenv.mkDerivation rec {
     homepage = http://sdr.osmocom.org/trac/wiki/GrOsmoSDR;
     license = licenses.gpl3Plus;
     platforms = platforms.linux;
-    maintainers = [ maintainers.bjornfor ];
+    maintainers = with maintainers; [ bjornfor the-kenny ];
   };
 }
diff --git a/pkgs/applications/misc/gqrx/default.nix b/pkgs/applications/misc/gqrx/default.nix
index 7d320cc938a2..d3e61da4fab0 100644
--- a/pkgs/applications/misc/gqrx/default.nix
+++ b/pkgs/applications/misc/gqrx/default.nix
@@ -42,6 +42,6 @@ stdenv.mkDerivation rec {
     # it's currently unknown which version of the BSD license that is.
     license = licenses.gpl3Plus;
     platforms = platforms.linux;  # should work on Darwin / OS X too
-    maintainers = [ maintainers.bjornfor ];
+    maintainers = with maintainers; [ bjornfor the-kenny ];
   };
 }

From 51c82551eeba1aefb25a469139e1a3becc40ee67 Mon Sep 17 00:00:00 2001
From: Moritz Ulrich <moritz@tarn-vedra.de>
Date: Mon, 27 Jul 2015 13:12:29 +0200
Subject: [PATCH 22/23] multimon-ng: New package.

A digital baseband audio protocol decoder.
---
 .../applications/misc/multimon-ng/default.nix | 41 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 43 insertions(+)
 create mode 100644 pkgs/applications/misc/multimon-ng/default.nix

diff --git a/pkgs/applications/misc/multimon-ng/default.nix b/pkgs/applications/misc/multimon-ng/default.nix
new file mode 100644
index 000000000000..794746653f75
--- /dev/null
+++ b/pkgs/applications/misc/multimon-ng/default.nix
@@ -0,0 +1,41 @@
+{ stdenv, fetchFromGitHub, qt4, libpulseaudio }:
+let
+  version = "1.0.0";
+in
+stdenv.mkDerivation {
+  name = "multimon-ng-${version}";
+
+  src = fetchFromGitHub {
+    owner = "EliasOenal";
+    repo = "multimon-ng";
+    rev = "4cc984f35f859539c94aa56d3fc6218a6de51148";
+    sha256 = "12z6f0ra2k0qh56pcvnwvlxd3msvr6yr97jvs7w5kf42jqbxdsga";
+  };
+
+  buildInputs = [ qt4 libpulseaudio ];
+
+  preBuild = "qmake multimon-ng.pro";
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp multimon-ng $out/bin
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Multimon is a digital baseband audio protocol decoder.";
+    longDescription = ''
+      multimon-ng a fork of multimon, a digital baseband audio
+      protocol decoder for common signaling modes in commercial and
+      amateur radio data services. It decodes the following digital
+      transmission modes:
+
+      POCSAG512 POCSAG1200 POCSAG2400 EAS UFSK1200 CLIPFSK AFSK1200
+      AFSK2400 AFSK2400_2 AFSK2400_3 HAPN4800 FSK9600 DTMF ZVEI1 ZVEI2
+      ZVEI3 DZVEI PZVEI EEA EIA CCIR MORSE CW
+    '';
+    homepage = "https://github.com/EliasOenal/multimon-ng";
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ the-kenny ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 265343cd490d..d9475648ff51 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12093,6 +12093,8 @@ let
     inherit (lua51Packages) luafilesystem lrexlib luazip luasqlite3;
   };
 
+  multimon-ng = callPackage ../applications/misc/multimon-ng { };
+
   multisync = callPackage ../applications/misc/multisync {
     inherit (gnome) ORBit2 libbonobo libgnomeui GConf;
   };

From 0411a4c376de8b3d9ab2a03c84c8b310f59b6380 Mon Sep 17 00:00:00 2001
From: Moritz Ulrich <moritz@tarn-vedra.de>
Date: Mon, 27 Jul 2015 16:52:50 +0200
Subject: [PATCH 23/23] direwolf: New package.

---
 pkgs/applications/misc/direwolf/default.nix | 36 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  2 ++
 2 files changed, 38 insertions(+)
 create mode 100644 pkgs/applications/misc/direwolf/default.nix

diff --git a/pkgs/applications/misc/direwolf/default.nix b/pkgs/applications/misc/direwolf/default.nix
new file mode 100644
index 000000000000..fc8d0ec36c85
--- /dev/null
+++ b/pkgs/applications/misc/direwolf/default.nix
@@ -0,0 +1,36 @@
+{ stdenv, fetchurl, unzip, alsaLib }:
+let
+  version = "1.2";
+in
+stdenv.mkDerivation rec {
+  name = "direwolf-${version}";
+  inherit version;
+
+  src = fetchurl {
+    url = "http://home.comcast.net/~wb2osz/Version%201.2/direwolf-${version}-src.zip";
+    sha256 = "0csl6harx7gmjmamxy0ylzhbamppphffisk8j33dc6g08k6rc77f";
+  };
+
+  buildInputs = [
+    unzip alsaLib
+  ];
+
+  patchPhase = ''
+    substituteInPlace Makefile.linux \
+      --replace "/usr/local" "$out" \
+      --replace "/usr/share" "$out/share"
+  '';
+
+  preInstall = ''
+    mkdir -p $out/bin
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A Soundcard Packet TNC, APRS Digipeater, IGate, APRStt gateway.";
+    # On the page: This page will be disappearing on October 8, 2015.
+    homepage = https://home.comcast.net/~wb2osz/site/;
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.the-kenny ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d9475648ff51..3e15e7b65c3d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10948,6 +10948,8 @@ let
 
   diffuse = callPackage ../applications/version-management/diffuse { };
 
+  direwolf = callPackage ../applications/misc/direwolf { };
+
   dirt = callPackage ../applications/audio/dirt {};
 
   distrho = callPackage ../applications/audio/distrho {};