diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index de8e617b322f1..41e8d603de7cd 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -57,6 +57,7 @@
   shlevy = "Shea Levy <shea@shealevy.com>";
   simons = "Peter Simons <simons@cryp.to>";
   smironov = "Sergey Mironov <ierton@gmail.com>";
+  sprock = "Roger Mason <rmason@mun.ca>";
   thammers = "Tobias Hammerschmidt <jawr@gmx.de>";
   the-kenny = "Moritz Ulrich <moritz@tarn-vedra.de>";
   tomberek = "Thomas Bereknyei <tomberek@gmail.com>";
diff --git a/nixos/modules/services/x11/window-managers/fvwm.nix b/nixos/modules/services/x11/window-managers/fvwm.nix
new file mode 100644
index 0000000000000..777bc7897a2b3
--- /dev/null
+++ b/nixos/modules/services/x11/window-managers/fvwm.nix
@@ -0,0 +1,43 @@
+{ pkgs, config, ... }:
+
+with pkgs.lib;
+
+let
+  cfg = config.services.xserver.windowManager.fvwm;
+in
+
+{
+  options = {
+    services.xserver.windowManager.fvwm = {
+      enable = mkOption {
+        default = false;
+        example = true;
+        description = "Enable the fvwm window manager.";
+      };
+
+      configFile = mkOption {
+        default = null;
+        type = types.nullOr types.path;
+        description = ''
+          Path to the fvwm configuration file.
+          If left at the default value, $HOME/.fvwm/config will be used.
+        '';
+      };
+    };
+  };
+
+  config = mkIf cfg.enable {
+    services.xserver.windowManager = {
+      session = [{
+        name = "fvwm";
+        start = ''
+          ${pkgs.fvwm}/bin/fvwm ${optionalString (cfg.configFile != null)
+            "-c \"${cfg.configFile}\""
+          } &
+          waitPID=$!
+        '';
+      }];
+    };
+    environment.systemPackages = [ pkgs.fvwm ];
+  };
+}
diff --git a/pkgs/applications/science/math/fricas/default.nix b/pkgs/applications/science/math/fricas/default.nix
new file mode 100644
index 0000000000000..42cac4af169b8
--- /dev/null
+++ b/pkgs/applications/science/math/fricas/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchurl, sbcl, libX11, libXpm, libICE, libSM, libXt, libXau, libXdmcp }:
+
+stdenv.mkDerivation rec {
+  name = "fricas-1.2.2";
+
+  src = fetchurl {
+    url    = "http://sourceforge.net/projects/fricas/files/fricas/1.2.2/${name}-full.tar.bz2";
+    sha256 = "87db64a1fd4211f3b776793acea931b4271d2e7a28396414c7d7397d833defe1";
+  };
+
+  buildInputs = [ sbcl libX11 libXpm libICE libSM libXt libXau libXdmcp ];
+
+  dontStrip = true;
+
+  meta = with stdenv.lib; {
+    description = "Fricas CAS";
+    homepage    = http://fricas.sourceforge.net/;
+    license     = "bsd";
+    platforms   = platforms.all;
+  };
+}
diff --git a/pkgs/applications/science/physics/root/cmake.patch b/pkgs/applications/science/physics/root/cmake.patch
new file mode 100644
index 0000000000000..b6efd7444fe9d
--- /dev/null
+++ b/pkgs/applications/science/physics/root/cmake.patch
@@ -0,0 +1,11 @@
+--- cmake/modules/RootBuildOptions.cmake	1969-12-31 20:30:01.000000000 -0330
++++ cmake/modules/RootBuildOptions.cmake	2014-01-10 14:09:29.424937408 -0330
+@@ -149,7 +149,7 @@
+ 
+ #---General Build options----------------------------------------------------------------------
+ # use, i.e. don't skip the full RPATH for the build tree
+-set(CMAKE_SKIP_BUILD_RPATH  FALSE)
++set(CMAKE_SKIP_BUILD_RPATH  TRUE)
+ # when building, don't use the install RPATH already (but later on when installing)
+ set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE) 
+ # add the automatically determined parts of the RPATH
diff --git a/pkgs/applications/science/physics/root/default.nix b/pkgs/applications/science/physics/root/default.nix
new file mode 100644
index 0000000000000..07cc266c7f678
--- /dev/null
+++ b/pkgs/applications/science/physics/root/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchurl, cmake, mesa, libX11, gfortran, libXpm, libXft, libXext, zlib }:
+
+stdenv.mkDerivation rec {
+  version = "5.34.14";
+  name = "root-${version}";
+
+  src = fetchurl {
+    url = "ftp://root.cern.ch/root/root_v${version}.source.tar.gz";
+    sha256 = "d5347ba1b614eb083cf08050b784d66a93c125ed89938708da1adb33323dee2b";
+  };
+
+  buildInputs = [ cmake gfortran mesa libX11 libXpm libXft libXext zlib ];
+
+  # CMAKE_INSTALL_RPATH_USE_LINK_PATH is set to FALSE in
+  # <rootsrc>/cmake/modules/RootBuildOptions.cmake.
+  # This patch sets it to TRUE.
+  patches = [ ./cmake.patch ];
+  patchFlags = "-p0";
+
+  meta = {
+    description = "ROOT - A data analysis framework";
+    homepage = http://root.cern.ch/drupal/;
+    platforms = stdenv.lib.platforms.mesaPlatforms;
+    maintainers = [ stdenv.lib.maintainers.sprock ];
+    license = stdenv.lib.license.lgpl21;
+  };
+}
diff --git a/pkgs/os-specific/linux/pmount/default.nix b/pkgs/os-specific/linux/pmount/default.nix
index f966180a8b690..bcc523c12de35 100644
--- a/pkgs/os-specific/linux/pmount/default.nix
+++ b/pkgs/os-specific/linux/pmount/default.nix
@@ -12,8 +12,8 @@ stdenv.mkDerivation rec {
   version = "0.9.23";
 
   src = fetchurl {
-    url = "mirror://debian/pool/main/p/pmount/pmount_${version}.orig.tar.bz2";
-    sha256 = "db38fc290b710e8e9e9d442da2fb627d41e13b3ee80326c15cc2595ba00ea036";
+    url = "https://launchpad.net/ubuntu/trusty/+source/pmount/0.9.23-2/+files/pmount_${version}.orig.tar.bz2";
+    sha256 = "0dm01sh5nnf2bk0jc0z87qxy2hbxcbxs4ba4kng8w3ki1clzqf6v";
   };
 
   buildInputs = [ intltool utillinux ];