Merge branch 'master.upstream' into staging.upstream

doc/haskell-users-guide.xml

@@ -92,18 +92,18 @@ error: attribute ‘haskellPackages’ in selection path
   </para>
   <programlisting>
 $ nix-env -qaP coreutils
-nixos.pkgs.coreutils  coreutils-8.23
+nixos.coreutils  coreutils-8.23
 </programlisting>
   <para>
     If your system responds like that (most NixOS installatios will),
     then the attribute path to <literal>haskellPackages</literal> is
-    <literal>nixos.pkgs.haskellPackages</literal>. Thus, if you want to
+    <literal>nixos.haskellPackages</literal>. Thus, if you want to
     use <literal>nix-env</literal> without giving an explicit
     <literal>-f</literal> flag, then that's the way to do it:
   </para>
   <programlisting>
-$ nix-env -qaP -A nixos.pkgs.haskellPackages
+$ nix-env -qaP -A nixos.haskellPackages
-$ nix-env -iA nixos.pkgs.haskellPackages.cabal-install
+$ nix-env -iA nixos.haskellPackages.cabal-install
 </programlisting>
   <para>
     Our current default compiler is GHC 7.10.x and the

lib/modules.nix

@@ -285,7 +285,7 @@ rec {
 
     in opt //
       { value = addErrorContext "while evaluating the option `${showOption loc}':" value;
-        definitions = map (def: def.value) defsFinal;
+        definitions = map (def: def.value) res.defsFinal;
         files = map (def: def.file) res.defsFinal;
         inherit (res) isDefined;
       };

nixos/doc/manual/configuration/ad-hoc-packages.xml

@@ -11,7 +11,7 @@ uninstall packages from the command line.  For instance, to install
 Mozilla Thunderbird:
 
 <screen>
-$ nix-env -iA nixos.pkgs.thunderbird</screen>
+$ nix-env -iA nixos.thunderbird</screen>
 
 If you invoke this as root, the package is installed in the Nix
 profile <filename>/nix/var/nix/profiles/default</filename> and visible

nixos/doc/manual/configuration/declarative-packages.xml

@@ -23,13 +23,13 @@ Nixpkgs will be built or downloaded as part of the system when you run
 <para>You can get a list of the available packages as follows:
 <screen>
 $ nix-env -qaP '*' --description
-nixos.pkgs.firefox   firefox-23.0   Mozilla Firefox - the browser, reloaded
+nixos.firefox   firefox-23.0   Mozilla Firefox - the browser, reloaded
 <replaceable>...</replaceable>
 </screen>
 
 The first column in the output is the <emphasis>attribute
 name</emphasis>, such as
-<literal>nixos.pkgs.thunderbird</literal>. (The
+<literal>nixos.thunderbird</literal>. (The
 <literal>nixos</literal> prefix allows distinguishing between
 different channels that you might have.)</para>
 

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

@@ -188,6 +188,15 @@ nix-env -f "<nixpkgs>" -iA haskellPackages.cabal-install
   </para>
 </listitem>
 
+<listitem>
+  <para>
+    The Nix expression search path (<envar>NIX_PATH</envar>) no longer
+    contains <filename>/etc/nixos/nixpkgs</filename> by default. You
+    can override <envar>NIX_PATH</envar> by setting
+    <option>nix.nixPath</option>.
+  </para>
+</listitem>
+
 </itemizedlist>
 </para>
 

nixos/lib/build-vms.nix

@@ -1,6 +1,6 @@
 { system, minimal ? false }:
 
-let pkgs = import ./nixpkgs.nix { config = {}; inherit system; }; in
+let pkgs = import ../.. { config = {}; inherit system; }; in
 
 with pkgs.lib;
 with import ../lib/qemu-flags.nix;

nixos/lib/channel-expr.nix

@@ -1,6 +0,0 @@
-{ system ? builtins.currentSystem }:
-
-{ pkgs =
-    (import nixpkgs/default.nix { inherit system; })
-    // { recurseForDerivations = true; };
-}

nixos/lib/make-channel.nix

@@ -10,19 +10,15 @@ pkgs.releaseTools.makeSourceTarball {
 
   buildInputs = [ pkgs.nix ];
 
-  expr = builtins.readFile ./channel-expr.nix;
-
   distPhase = ''
     rm -rf .git
     echo -n $VERSION_SUFFIX > .version-suffix
     echo -n ${nixpkgs.rev or nixpkgs.shortRev} > .git-revision
     releaseName=nixos-$VERSION$VERSION_SUFFIX
     mkdir -p $out/tarballs
-    mkdir ../$releaseName
+    cp -prd . ../$releaseName
-    cp -prd . ../$releaseName/nixpkgs
     chmod -R u+w ../$releaseName
-    ln -s nixpkgs/nixos ../$releaseName/nixos
+    ln -s . ../$releaseName/nixpkgs # hack to make ‘<nixpkgs>’ work
-    echo "$expr" > ../$releaseName/default.nix
     NIX_STATE_DIR=$TMPDIR nix-env -f ../$releaseName/default.nix -qaP --meta --xml \* > /dev/null
     cd ..
     chmod -R u+w $releaseName

nixos/lib/nixpkgs.nix

@@ -1,8 +0,0 @@
-/* Terrible backward compatibility hack to get the path to Nixpkgs
-   from here.  Usually, that's the relative path ‘../..’.  However,
-   when using the NixOS channel, <nixos> resolves to a symlink to
-   nixpkgs/nixos, so ‘../..’ doesn't resolve to the top-level Nixpkgs
-   directory but one above it.  So check for that situation. */
-if builtins.pathExists ../../.version then import ../..
-else if builtins.pathExists ../../nixpkgs then import ../../nixpkgs
-else abort "Can't find Nixpkgs, please set ‘NIX_PATH=nixpkgs=/path/to/nixpkgs’."

nixos/modules/installer/cd-dvd/channel.nix

@@ -9,18 +9,17 @@ let
 
   # We need a copy of the Nix expressions for Nixpkgs and NixOS on the
   # CD.  These are installed into the "nixos" channel of the root
-  # user, as expected by nixos-rebuild/nixos-install.
+  # user, as expected by nixos-rebuild/nixos-install. FIXME: merge
+  # with make-channel.nix.
   channelSources = pkgs.runCommand "nixos-${config.system.nixosVersion}"
-    { expr = readFile ../../../lib/channel-expr.nix; }
+    { }
     ''
-      mkdir -p $out/nixos
+      mkdir -p $out
-      cp -prd ${pkgs.path} $out/nixos/nixpkgs
+      cp -prd ${pkgs.path} $out/nixos
-      ln -s nixpkgs/nixos $out/nixos/nixos
       chmod -R u+w $out/nixos
-      rm -rf $out/nixos/nixpkgs/.git
+      ln -s . $out/nixos/nixpkgs
-      echo -n ${config.system.nixosVersion} > $out/nixos/nixpkgs/.version
+      rm -rf $out/nixos/.git
-      echo -n "" > $out/nixos/nixpkgs/.version-suffix
+      echo -n ${config.system.nixosVersionSuffix} > $out/nixos/.version-suffix
-      echo "$expr" > $out/nixos/default.nix
     '';
 
 in

nixos/modules/installer/tools/nixos-build-vms/nixos-build-vms.sh

@@ -53,5 +53,5 @@ fi
 
 # Build a network of VMs
 
-nix-build '<nixos/modules/installer/tools/nixos-build-vms/build-vms.nix>' \
+nix-build '<nixpkgs/nixos/modules/installer/tools/nixos-build-vms/build-vms.nix>' \
     --argstr networkExpr $networkExpr $noOutLinkArg $showTraceArg

nixos/modules/installer/tools/nixos-checkout.nix

@@ -27,7 +27,7 @@ let
 
         if [ -z "$(type -P git)" ]; then
             echo "installing Git..."
-            nix-env -iA nixos.pkgs.git || nix-env -i git
+            nix-env -iA nixos.git
         fi
 
         # Move any old nixpkgs directories out of the way.

nixos/modules/installer/tools/nixos-install.sh

@@ -256,14 +256,8 @@ NIXOS_INSTALL_GRUB=1 chroot $mountPoint \
 chroot $mountPoint /nix/var/nix/profiles/system/activate
 
 
-# Some systems may not be prepared to use NixOS' paths.
-export PATH=/run/current-system/sw/bin:/run/current-system/sw/sbin:$PATH
-export NIX_PATH=/nix/var/nix/profiles/per-user/root/channels/nixos:nixpkgs=/etc/nixos/nixpkgs
-export NIX_PATH=$NIX_PATH:nixos-config=/etc/nixos/configuration.nix:/nix/var/nix/profiles/per-user/root/channels
-
-
 # Ask the user to set a root password.
-if [ "$(chroot $mountPoint nix-instantiate --eval '<nixpkgs/nixos>' -A config.users.mutableUsers)" = true ] && [ -t 0 ] ; then
+if [ "$(chroot $mountPoint /run/current-system/sw/bin/sh -l -c "nix-instantiate --eval '<nixpkgs/nixos>' -A config.users.mutableUsers")" = true ] && [ -t 0 ] ; then
     echo "setting root password..."
     chroot $mountPoint /var/setuid-wrappers/passwd
 fi

nixos/modules/installer/tools/nixos-rebuild.sh

@@ -157,9 +157,9 @@ if [ -n "$buildNix" ]; then
             if ! nix-build '<nixpkgs>' -A nix -o $tmpDir/nix "${extraBuildFlags[@]}" > /dev/null; then
                 machine="$(uname -m)"
                 if [ "$machine" = x86_64 ]; then
-                    nixStorePath=/nix/store/ffig6yaggbh12dh9y5pnf1grf5lqyipz-nix-1.8
+                    nixStorePath=/nix/store/664kxr14kfgx4dl095crvmr7pbh9xlh5-nix-1.9
                 elif [[ "$machine" =~ i.86 ]]; then
-                    nixStorePath=/nix/store/lglhfp4mimfa5wzjjf1kqz6f5wlsj2mn-nix-1.8
+                    nixStorePath=/nix/store/p7xdvz72xx3rhm121jclsbdmmcds7xh6-nix-1.9
                 else
                     echo "$0: unsupported platform"
                     exit 1

nixos/modules/misc/assertions.nix

@@ -30,5 +30,5 @@ with lib;
     };
 
   };
-  # impl of assertions is in <nixos/modules/system/activation/top-level.nix>
+  # impl of assertions is in <nixpkgs/nixos/modules/system/activation/top-level.nix>
 }

nixos/modules/misc/extra-arguments.nix

@@ -2,7 +2,7 @@
 
 {
   _module.args = {
-    pkgs_i686 = import ../../lib/nixpkgs.nix {
+    pkgs_i686 = import ../../.. {
       system = "i686-linux";
       config.allowUnfree = true;
     };

nixos/modules/misc/nixpkgs.nix

@@ -72,7 +72,7 @@ in
   };
 
   config = {
-    _module.args.pkgs = import ../../lib/nixpkgs.nix {
+    _module.args.pkgs = import ../../.. {
       system = config.nixpkgs.system;
 
       inherit (config.nixpkgs) config;

nixos/modules/profiles/clone-config.nix

@@ -30,7 +30,7 @@ let
   relocatedModuleFiles =
     let
       relocateNixOS = path:
-        "<nixos" + removePrefix nixosPath (toString path) + ">";
+        "<nixpkgs/nixos" + removePrefix nixosPath (toString path) + ">";
       relocateOthers = null;
     in
       { nixos = map relocateNixOS partitionedModuleFiles.nixos;

nixos/modules/programs/environment.nix

@@ -23,15 +23,6 @@ in
         EDITOR = mkDefault "nano";
       };
 
-    environment.sessionVariables =
-      { NIX_PATH =
-          [ "/nix/var/nix/profiles/per-user/root/channels/nixos"
-            "nixpkgs=/etc/nixos/nixpkgs"
-            "nixos-config=/etc/nixos/configuration.nix"
-            "/nix/var/nix/profiles/per-user/root/channels"
-          ];
-      };
-
     environment.profiles =
       [ "$HOME/.nix-profile"
         "/nix/var/nix/profiles/default"

nixos/modules/services/misc/nix-daemon.nix

@@ -309,6 +309,20 @@ in
         '';
       };
 
+      nixPath = mkOption {
+        type = types.listOf types.str;
+        default =
+          [ "/nix/var/nix/profiles/per-user/root/channels/nixos"
+            "nixos-config=/etc/nixos/configuration.nix"
+            "/nix/var/nix/profiles/per-user/root/channels"
+          ];
+        description = ''
+          The default Nix expression search path, used by the Nix
+          evaluator to look up paths enclosed in angle brackets
+          (e.g. <literal>&lt;nixpkgs&gt;</literal>).
+        '';
+      };
+
     };
 
   };
@@ -378,7 +392,9 @@ in
       };
 
     # Set up the environment variables for running Nix.
-    environment.sessionVariables = cfg.envVars;
+    environment.sessionVariables = cfg.envVars //
+      { NIX_PATH = concatStringsSep ":" cfg.nixPath;
+      };
 
     environment.extraInit =
       ''

nixos/modules/services/networking/dnsmasq.nix

@@ -98,6 +98,7 @@ in
           ExecStart = "${dnsmasq}/bin/dnsmasq -k --enable-dbus --user=dnsmasq -C ${dnsmasqConf}";
           ExecReload = "${dnsmasq}/bin/kill -HUP $MAINPID";
         };
+        restartTriggers = [ config.environment.etc.hosts.source ];
     };
 
   };

nixos/tests/check-filesystems.nix

@@ -1,85 +0,0 @@
-{ nixos ? ./..
-, nixpkgs ? /etc/nixos/nixpkgs
-, system ? builtins.currentSystem
-}:
-
-with import ../lib/build-vms.nix { inherit nixos nixpkgs system; };
-
-rec {
-  name = "check-filesystems";
-  meta = with pkgs.stdenv.lib.maintainers; {
-    maintainers = [ eelco chaoflow ];
-  };
-
-  nodes = {
-    share = {pkgs, config, ...}: {
-      services.nfs.server.enable = true;
-      services.nfs.server.exports = ''
-        /repos1 192.168.1.0/255.255.255.0(rw,no_root_squash)
-        /repos2 192.168.1.0/255.255.255.0(rw,no_root_squash)
-      '';
-      services.nfs.server.createMountPoints = true;
-
-      jobs.checkable = {
-        startOn = [
-          config.jobs.nfs_kernel_exports.name
-          config.jobs.nfs_kernel_nfsd.name
-        ];
-        respawn = true;
-      };
-    };
-
-    fsCheck = {pkgs, config, ...}: {
-      fileSystems =
-        let
-          repos1 = {
-            mountPoint = "/repos1";
-            autocreate = true;
-            device = "share:/repos1";
-            fsType = "nfs";
-          };
-
-          repos2 = {
-            mountPoint = "/repos2";
-            autocreate = true;
-            device = "share:/repos2";
-            fsType = "nfs";
-          };
-        in pkgs.lib.mkVMOverride [
-          repos1
-          repos1 # check remount
-          repos2 # check after remount
-        ];
-
-      jobs.checkable = {
-        startOn = "stopped ${config.jobs.filesystems.name}";
-        respawn = true;
-      };
-    };
-  };
-
-  vms = buildVirtualNetwork { inherit nodes; };
-
-  test = runTests vms
-    ''
-      startAll;
-
-      $share->waitForUnit("checkable");
-      $fsCheck->waitForUnit("checkable");
-
-      # check repos1
-      $fsCheck->succeed("test -d /repos1");
-      $share->succeed("touch /repos1/test1");
-      $fsCheck->succeed("test -e /repos1/test1");
-
-      # check repos2 (check after remount)
-      $fsCheck->succeed("test -d /repos2");
-      $share->succeed("touch /repos2/test2");
-      $fsCheck->succeed("test -e /repos2/test2");
-
-      # check without network
-      $share->block();
-      $fsCheck->fail("test -e /repos1/test1");
-      $fsCheck->fail("test -e /repos2/test2");
-    '';
-}

nixos/tests/containers.nix

@@ -46,7 +46,7 @@ import ./make-test.nix ({ pkgs, ...} : {
       $machine->fail("curl --fail --connect-timeout 2 http://$ip/ > /dev/null");
 
       # Make sure we have a NixOS tree (required by ‘nixos-container create’).
-      $machine->succeed("PAGER=cat nix-env -qa -A nixos.pkgs.hello >&2");
+      $machine->succeed("PAGER=cat nix-env -qa -A nixos.hello >&2");
 
       # Create some containers imperatively.
       my $id1 = $machine->succeed("nixos-container create foo --ensure-unique-name");

pkgs/applications/audio/drumkv1/default.nix

@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "drumkv1-${version}";
-  version = "0.6.3";
+  version = "0.7.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/drumkv1/${name}.tar.gz";
-    sha256 = "1f0vpwq7vydldrq9fdfipbkzqqndyxlx0n81ch1i9kw81xj3sxjq";
+    sha256 = "1fbi835559qsg9fxgdbdyf5z1zlzf9n8zrq0p67damb55mmigaj8";
   };
 
   buildInputs = [ libjack2 libsndfile lv2 qt4 ];

pkgs/applications/audio/guitarix/default.nix

@@ -11,11 +11,11 @@ in
 
 stdenv.mkDerivation rec {
   name = "guitarix-${version}";
-  version = "0.32.3";
+  version = "0.33.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/guitarix/guitarix2-${version}.tar.bz2";
-    sha256 = "1ybc5jk7fj6n8qh9ajzl1f6fzdmzab4nwjrh4fsylm94dn1jv0if";
+    sha256 = "1w6dg2n0alfjsx1iy6s53783invygwxk11p1i65cc3nq3zlidcgx";
   };
 
   nativeBuildInputs = [ gettext intltool pkgconfig python ];

pkgs/applications/audio/samplv1/default.nix

@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "samplv1-${version}";
-  version = "0.6.3";
+  version = "0.7.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/samplv1/${name}.tar.gz";
-    sha256 = "1c62fpfl9xv93m04hfh72vzbljr0c5p409vzf3xxmvj9x610yx1w";
+    sha256 = "0w1cl1vjhzzdyxfn8fcfgx5j5d4gi182w5b89f7qzg1akhmsqmfr";
   };
 
   buildInputs = [ libjack2 libsndfile lv2 qt4 ];

pkgs/applications/editors/emacs-modes/org/default.nix

@@ -2,11 +2,11 @@
 , texLiveAggregationFun }:
 
 stdenv.mkDerivation rec {
-  name = "org-8.2.10";
+  name = "org-8.3";
 
   src = fetchurl {
     url = "http://orgmode.org/${name}.tar.gz";
-    sha256 = "1xm8n8zwr3676rl4pd32k61rd7rimlihhrw5a7r4z7r154c4a2fz";
+    sha256 = "0yqbl232hfppljz545jbjawwaw7qjdjsq97c0wf0cbkghgpln3wy";
   };
 
   buildInputs = [ emacs ];

pkgs/applications/editors/vim/macvim.nix

@@ -5,11 +5,11 @@
 stdenv.mkDerivation rec {
   name = "macvim-${version}";
 
-  version = "7.4.479";
+  version = "7.4.648";
 
   src = fetchurl {
-    url = "https://github.com/genoma/macvim/archive/g-snapshot-21.tar.gz";
+    url = "https://github.com/genoma/macvim/archive/g-snapshot-32.tar.gz";
-    sha256 = "1s86dpb8bcxh309gikiz8gm9ygv3d2jy6i4qlnxarbvcdk65fzv4";
+    sha256 = "1wqg5sy7krgqg3sj00gb34avg90ga2kbvv09bsxv2267j7agi0iq";
   };
 
   enableParallelBuilding = true;

pkgs/applications/version-management/fossil/default.nix

@@ -1,15 +1,15 @@
 {stdenv, fetchurl, zlib, openssl, tcl, readline, sqlite, withJson ? true}:
 
 stdenv.mkDerivation rec {
-  name = "fossil-1.32";
+  name = "fossil-1.33";
 
   src = fetchurl {
     urls = 
       [
-        "https://www.fossil-scm.org/fossil/tarball/Fossil-6c40678e.tar.gz?uuid=6c40678e9114c41a50f73cc43f6f942ace0408ec"
+        https://www.fossil-scm.org/download/fossil-src-1.33.tar.gz
-        ];
+      ];
     name = "${name}.tar.gz";
-    sha256 = "0f1rvqiy630z2q1q8r3kgdd0c6sxjx8c8pm46yabn238xvf3bfnr";
+    sha256 = "0gkzd9nj3xyznh9x8whv0phdnj11l5c8164rc3l0jvs5i61c95b2";
   };
 
   buildInputs = [ zlib openssl readline sqlite ];

pkgs/applications/version-management/git-and-tools/svn2git-kde/default.nix

@@ -21,4 +21,6 @@ stdenv.mkDerivation rec {
   '';
 
   buildInputs = [ subversion apr qt4 ];
+
+  meta.broken = true;
 }

pkgs/applications/version-management/git-and-tools/svn2git/default.nix

@@ -32,7 +32,7 @@ stdenv.mkDerivation {
 
   meta = {
     homepage = https://github.com/nirvdrum/svn2git;
-    description = "Ruby tool for importing existing svn projects into git";
+    description = "Tool for importing Subversion repositories into git";
     license = stdenv.lib.licenses.mit;
 
     maintainers = [ stdenv.lib.maintainers.the-kenny ];

pkgs/data/misc/geolite-legacy/default.nix

@@ -8,23 +8,23 @@ let
 
   # Annoyingly, these files are updated without a change in URL. This means that
   # builds will start failing every month or so, until the hashes are updated.
-  version = "2015-08-03";
+  version = "2015-08-05";
 in
 stdenv.mkDerivation {
   name = "geolite-legacy-${version}";
 
   srcGeoIP = fetchDB
     "GeoLiteCountry/GeoIP.dat.gz" "GeoIP.dat.gz"
-    "1yacbh8qcakmnpipscdh99vmsm0874g2gkq8gp8hjgkgi0zvcsnz";
+    "04r1jir9xpd1h5z0a58mwdsbfdbf2kap0ac498w05i11j4vrlh5n";
   srcGeoIPv6 = fetchDB
     "GeoIPv6.dat.gz" "GeoIPv6.dat.gz"
-    "038ll8142svhyffxxrg0isrr16rjbz0cnkhd14mck77f1v8z01y5";
+    "0vr2a4mlqlaxq3jz8282zygb2y5hx7y660yrjcq02rpmgpmaxkrd";
   srcGeoLiteCity = fetchDB
     "GeoLiteCity.dat.xz" "GeoIPCity.dat.xz"
-    "0x5ihg7qikzc195nix9r0izvbdnj4hy4rznvaxk56rf8yqcigdyv";
+    "11jpl54s1r98adlsr2f88zj4x9pg7gwxphd7hhq8jp3hwrgrwhs8";
   srcGeoLiteCityv6 = fetchDB
     "GeoLiteCityv6-beta/GeoLiteCityv6.dat.gz" "GeoIPCityv6.dat.gz"
-    "0j5dq06pjrh6d94wczsg6qdys4v164nvp2a7qqrg8w4knh94qp6n";
+    "1fhi5vm4drfzyl29b491pr1xr2kbsr3izp9a7k5zm3zkqags2187";
   srcGeoIPASNum = fetchDB
     "asnum/GeoIPASNum.dat.gz" "GeoIPASNum.dat.gz"
     "04qlh6zr8m5qxl2gcysb721bqlnqrxhngh128zj1w8rhqckjndgj";

pkgs/desktops/gnome-3/3.16/apps/cheese/default.nix

@@ -0,0 +1,30 @@
+{ stdenv, intltool, fetchurl, wrapGAppsHook, gnome-video-effects, libcanberra_gtk3
+, pkgconfig, gtk3, glib, clutter_gtk, clutter-gst_2, udev, gst_all_1, itstool
+, adwaita-icon-theme, librsvg, gdk_pixbuf, gnome3, gnome_desktop, libxml2, libtool }:
+
+stdenv.mkDerivation rec {
+  name = "cheese-${gnome3.version}.1";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/cheese/${gnome3.version}/${name}.tar.xz";
+    sha256 = "184hzwrjjn94ndivb54rrif4jnbr66p1j0nlqqi3nw6qsrm2yqj4";
+  };
+
+  buildInputs = [ pkgconfig gtk3 glib intltool wrapGAppsHook gnome-video-effects itstool
+                  gdk_pixbuf adwaita-icon-theme librsvg udev gst_all_1.gstreamer libxml2
+                  gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good gnome_desktop
+                  gst_all_1.gst-plugins-bad clutter_gtk clutter-gst_2
+                  libtool libcanberra_gtk3 ];
+
+  enableParallelBuilding = true;
+
+  NIX_CFLAGS_COMPILE = "-I${glib}/include/gio-unix-2.0";
+
+  meta = with stdenv.lib; {
+    homepage = https://wiki.gnome.org/Apps/Cheese;
+    description = "Take photos and videos with your webcam, with fun graphical effects";
+    maintainers = gnome3.maintainers;
+    license = licenses.gpl3;
+    platforms = platforms.linux;
+  };
+}

pkgs/desktops/gnome-3/3.16/core/gnome-desktop/default.nix

@@ -21,7 +21,9 @@ stdenv.mkDerivation rec {
   buildInputs = [ pkgconfig python libxml2Python libxslt which libX11
                   xkeyboard_config isocodes itstool wayland
                   gtk3 glib intltool gnome_doc_utils libxkbfile
-                  gnome3.gsettings_desktop_schemas gobjectIntrospection ];
+                  gobjectIntrospection ];
+
+  propagatedBuildInputs = [ gnome3.gsettings_desktop_schemas ];
 
   meta = with stdenv.lib; {
     platforms = platforms.linux;

pkgs/desktops/gnome-3/3.16/default.nix

@@ -44,6 +44,7 @@ let
   gnome3 = self // { recurseForDerivations = false; };
   clutter = pkgs.clutter_1_22;
   clutter_gtk = pkgs.clutter_gtk_1_6.override { inherit clutter gtk3; };
+  clutter-gst_2 = pkgs.clutter-gst;
   clutter-gst = pkgs.clutter-gst_3_0.override { inherit clutter; };
   cogl = pkgs.cogl_1_20;
   gtk = gtk3;
@@ -246,6 +247,8 @@ let
     webkitgtk = webkitgtk24x;
   };
 
+  cheese = callPackage ./apps/cheese { };
+
   evolution = callPackage ./apps/evolution {
     webkitgtk = webkitgtk24x;
   };
@@ -330,6 +333,8 @@ let
 
   pomodoro = callPackage ./misc/pomodoro { };
 
+  gnome-video-effects = callPackage ./misc/gnome-video-effects { };
+
     };
   in self; # pkgsFun
 

pkgs/desktops/gnome-3/3.16/misc/gnome-video-effects/default.nix

@@ -0,0 +1,20 @@
+{ stdenv, fetchurl, pkgconfig, intltool, gnome3 }:
+
+stdenv.mkDerivation rec {
+  name = "gnome-video-effects-${version}";
+  version = "0.4.1";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/gnome-video-effects/0.4/${name}.tar.xz";
+    sha256 = "0jl4iny2dqpcgi3sgxzpgnbw0752i8ay3rscp2cgdjlp79ql5gil";
+  };
+
+  buildInputs = [ pkgconfig intltool ];
+
+  meta = with stdenv.lib; {
+    homepage = https://wiki.gnome.org/Projects/GnomeVideoEffects;
+    platforms = platforms.linux;
+    maintainers = gnome3.maintainers;
+    license = licenses.gpl2;
+  };
+}

pkgs/development/compilers/ghc/7.10.2.nix

@@ -16,12 +16,12 @@ let
 in
 
 stdenv.mkDerivation rec {
-  version = "7.10.1.20150630";
+  version = "7.10.2";
   name = "ghc-${version}";
 
   src = fetchurl {
-    url = "https://downloads.haskell.org/~ghc/7.10.2-rc2/${name}-src.tar.xz";
+    url = "https://downloads.haskell.org/~ghc/7.10.2/${name}-src.tar.xz";
-    sha256 = "1wxf7jkkgpvvrg3q311c4rca4vsxrqrmnrqg4j4klgj445yj82gb";
+    sha256 = "1x8m4rp2v7ydnrz6z9g8x7z3x3d3pxhv2pixy7i7hkbqbdsp7kal";
   };
 
   buildInputs = [ ghc perl ];

pkgs/development/compilers/ghcjs/default.nix

@@ -41,22 +41,22 @@ let
   version = "0.1.0";
   ghcjsBoot = fetchgit {
     url = git://github.com/ghcjs/ghcjs-boot.git;
-    rev = "d3581514d0a5073f8220a2f5baafe6866faa35a0"; # 7.10 branch
+    rev = "d435c60b62d24b7a4117493f7aaecbfa09968fe6"; # 7.10 branch
-    sha256 = "1p13ifidpi7y1mjq5qv9229isfnsiklizci7i55sf83mp6wqdyvr";
+    sha256 = "07vhmjz21ccnqccms003550xacmwb08pjdkhnjcwcbl2603v4na1";
     fetchSubmodules = true;
   };
   shims = fetchgit {
     url = git://github.com/ghcjs/shims.git;
-    rev = "9b196ff5ff13a24997011009b37c980c5534e24f"; # master branch
+    rev = "0b670ca27fff3f0bad515c37e56ccb8b4d6758fb"; # master branch
-    sha256 = "1zsfxka692fr3zb710il7g1sj64xwaxmasimciylb4wx84h7c30w";
+    sha256 = "19zq79f2y59lw7c8m100awh3rcra5yhbsvpb5xmp3mq6grac7h08";
   };
 in mkDerivation (rec {
   pname = "ghcjs";
   inherit version;
   src = fetchgit {
     url = git://github.com/ghcjs/ghcjs.git;
-    rev = "c1b6239b0289371dc6b8d17dfd845c14bd4dc490"; # master branch
+    rev = "fb1faa9cb0a11a8b27b0033dfdb07aafb6add35e"; # master branch
-    sha256 = "0ncbk7m1l7cpdgmabm14d7f97fw3vy0hmpj4vs4kkwhhfjf6kp8s";
+    sha256 = "1vqf19059j86h3rnbvzcp55bdqd5dkw3krb5vkw5mgsmva2g8sch";
   };
   isLibrary = true;
   isExecutable = true;

pkgs/development/haskell-modules/configuration-common.nix

@@ -11,6 +11,9 @@ self: super: {
   cabal-install = (dontCheck super.cabal-install).overrideScope (self: super: { Cabal = self.Cabal_1_22_4_0; zlib = self.zlib_0_5_4_2; });
   cabal-install_1_18_1_0 = (dontCheck super.cabal-install_1_18_1_0).overrideScope (self: super: { Cabal = self.Cabal_1_18_1_6; zlib = self.zlib_0_5_4_2; });
 
+  # Link statically to avoid runtime dependency on GHC.
+  jailbreak-cabal = disableSharedExecutables super.jailbreak-cabal;
+
   # Break infinite recursions.
   Dust-crypto = dontCheck super.Dust-crypto;
   hasql-postgres = dontCheck super.hasql-postgres;
@@ -808,6 +811,7 @@ self: super: {
   Frames = dontDistribute super.Frames;
   hgeometry = dontDistribute super.hgeometry;
   hipe = dontDistribute super.hipe;
+  hsqml-datamodel-vinyl = dontDistribute super.hsqml-datamodel-vinyl;
   singleton-nats = dontDistribute super.singleton-nats;
   singletons = markBroken super.singletons;
   units-attoparsec = dontDistribute super.units-attoparsec;
@@ -896,4 +900,7 @@ self: super: {
   # https://ghc.haskell.org/trac/ghc/ticket/9825
   vimus = overrideCabal super.vimus (drv: { broken = pkgs.stdenv.isLinux && pkgs.stdenv.isi686; });
 
+  # https://github.com/hspec/mockery/issues/6
+  mockery = overrideCabal super.mockery (drv: { preCheck = "export TRAVIS=true"; });
+
 }

pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix

@@ -41,7 +41,7 @@ self: super: {
   unix = null;
 
   # binary is not a core library for this compiler.
-  binary = self.binary_0_7_5_0;
+  binary = self.binary_0_7_6_1;
 
   # deepseq is not a core library for this compiler.
   deepseq_1_3_0_1 = dontJailbreak super.deepseq_1_3_0_1;

pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix

@@ -35,7 +35,7 @@ self: super: {
   unix = null;
 
   # binary is not a core library for this compiler.
-  binary = self.binary_0_7_5_0;
+  binary = self.binary_0_7_6_1;
 
   # deepseq is not a core library for this compiler.
   deepseq = self.deepseq_1_4_1_1;
@@ -70,4 +70,7 @@ self: super: {
   # Needs hashable on pre 7.10.x compilers.
   nats = addBuildDepend super.nats self.hashable;
 
+  # Newer versions require bytestring >=0.10.
+  tar = super.tar_0_4_1_0;
+
 }

pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix

@@ -41,7 +41,7 @@ self: super: {
   transformers = self.transformers_0_4_3_0;
 
   # https://github.com/haskell/cabal/issues/2322
-  Cabal_1_22_4_0 = super.Cabal_1_22_4_0.override { binary = self.binary_0_7_5_0; process = self.process_1_2_3_0; };
+  Cabal_1_22_4_0 = super.Cabal_1_22_4_0.override { binary = self.binary_0_7_6_1; process = self.process_1_2_3_0; };
 
   # Newer versions don't compile.
   Cabal_1_18_1_6 = dontJailbreak super.Cabal_1_18_1_6;
@@ -70,4 +70,7 @@ self: super: {
   # Needs hashable on pre 7.10.x compilers.
   nats = addBuildDepend super.nats self.hashable;
 
+  # Newer versions require bytestring >=0.10.
+  tar = super.tar_0_4_1_0;
+
 }

pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix

@@ -38,10 +38,10 @@ self: super: {
   transformers = self.transformers_0_4_3_0;
 
   # https://github.com/haskell/cabal/issues/2322
-  Cabal_1_22_4_0 = super.Cabal_1_22_4_0.override { binary = dontCheck self.binary_0_7_5_0; };
+  Cabal_1_22_4_0 = super.Cabal_1_22_4_0.override { binary = dontCheck self.binary_0_7_6_1; };
 
   # Avoid inconsistent 'binary' versions from 'text' and 'Cabal'.
-  cabal-install = super.cabal-install.overrideScope (self: super: { binary = dontCheck self.binary_0_7_5_0; });
+  cabal-install = super.cabal-install.overrideScope (self: super: { binary = dontCheck self.binary_0_7_6_1; });
 
   # https://github.com/tibbe/hashable/issues/85
   hashable = dontCheck super.hashable;
@@ -79,4 +79,7 @@ self: super: {
   # Avoid depending on tasty-golden.
   monad-par = dontCheck super.monad-par;
 
+  # Newer versions require bytestring >=0.10.
+  tar = super.tar_0_4_1_0;
+
 }

pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix

@@ -40,10 +40,10 @@ self: super: {
   xhtml = self.xhtml_3000_2_1;
 
   # https://github.com/haskell/cabal/issues/2322
-  Cabal_1_22_4_0 = super.Cabal_1_22_4_0.override { binary = dontCheck self.binary_0_7_5_0; };
+  Cabal_1_22_4_0 = super.Cabal_1_22_4_0.override { binary = dontCheck self.binary_0_7_6_1; };
 
   # Avoid inconsistent 'binary' versions from 'text' and 'Cabal'.
-  cabal-install = super.cabal-install.overrideScope (self: super: { binary = dontCheck self.binary_0_7_5_0; });
+  cabal-install = super.cabal-install.overrideScope (self: super: { binary = dontCheck self.binary_0_7_6_1; });
 
   # https://github.com/tibbe/hashable/issues/85
   hashable = dontCheck super.hashable;

pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix

@@ -85,8 +85,8 @@ self: super: {
   seqid-streams = super.seqid-streams_0_1_0;
 
   # Need binary >= 0.7.2, but our compiler has only 0.7.1.0.
-  hosc = super.hosc.overrideScope (self: super: { binary = self.binary_0_7_5_0; });
+  hosc = super.hosc.overrideScope (self: super: { binary = self.binary_0_7_6_1; });
-  tidal-midi = super.tidal-midi.overrideScope (self: super: { binary = self.binary_0_7_5_0; });
+  tidal-midi = super.tidal-midi.overrideScope (self: super: { binary = self.binary_0_7_6_1; });
 
   # These packages need mtl 2.2.x directly or indirectly via dependencies.
   amazonka = markBroken super.amazonka;

pkgs/development/haskell-modules/generic-builder.nix

@@ -45,7 +45,6 @@
 , useCpphs ? false
 } @ args:
 
-assert pkgconfigDepends != [] -> pkgconfig != null;
 assert editedCabalFile != null -> revision != null;
 
 let
@@ -105,10 +104,13 @@ let
   isHaskellPkg = x: (x ? pname) && (x ? version) && (x ? env);
   isSystemPkg = x: !isHaskellPkg x;
 
+  allPkgconfigDepends = pkgconfigDepends ++ libraryPkgconfigDepends ++ executablePkgconfigDepends ++
+                        optionals doCheck testPkgconfigDepends;
+
   propagatedBuildInputs = buildDepends ++ libraryHaskellDepends ++ executableHaskellDepends;
   otherBuildInputs = extraLibraries ++ librarySystemDepends ++ executableSystemDepends ++
                      buildTools ++ libraryToolDepends ++ executableToolDepends ++
-                     optionals (pkgconfigDepends != []) ([pkgconfig] ++ pkgconfigDepends ++ libraryPkgconfigDepends ++ executablePkgconfigDepends) ++
+                     optionals (allPkgconfigDepends != []) ([pkgconfig] ++ allPkgconfigDepends) ++
                      optionals doCheck (testDepends ++ testHaskellDepends ++ testSystemDepends);
   allBuildInputs = propagatedBuildInputs ++ otherBuildInputs;
 
@@ -122,6 +124,9 @@ let
   ghcCommandCaps = toUpper ghcCommand;
 
 in
+
+assert allPkgconfigDepends != [] -> pkgconfig != null;
+
 stdenv.mkDerivation ({
   name = "${optionalString (hasActiveLibrary && pname != "ghcjs") "haskell-"}${pname}-${version}";
 

pkgs/development/libraries/libcouchbase/default.nix

@@ -1,23 +1,16 @@
-{ stdenv, fetchgit, autoconf, automake, libtool,
+{ stdenv, fetchurl, cmake, pkgconfig, libevent, openssl}:
-pkgconfig, perl, git, libevent, openssl}:
 
 stdenv.mkDerivation {
-  name = "libcouchbase-2.4.4";
+  name = "libcouchbase-2.5.2";
-  src = fetchgit {
+  src = fetchurl {
-    url = "https://github.com/couchbase/libcouchbase.git";
+    url = "https://github.com/couchbase/libcouchbase/archive/2.5.2.tar.gz";
-    rev = "4410eebcd813844b6cd6f9c7eeb4ab3dfa2ab8ac";
+    sha256 = "0ka1hix38a2kdhxz6n8frssyznf78ra0irga9d8lr5683y73xw24";
-    sha256 = "02lzv5l6fvnqr2l9bqfha0pzkzlzjfddn3w5zcbjz36kw4p2p4h9";
-    leaveDotGit = true;
   };
 
-  preConfigure = ''
+  cmakeFlags = "-DLCB_NO_MOCK=ON";
-    patchShebangs ./config/
-    ./config/autorun.sh
-  '';
 
-  configureFlags = "--disable-couchbasemock";
+  nativeBuildInputs = [ cmake pkgconfig ];
-
+  buildInputs = [ libevent openssl];
-  buildInputs = [ autoconf automake libtool pkgconfig perl git libevent openssl];
 
   meta = {
     description = "C client library for Couchbase";

pkgs/development/python-modules/blivet/default.nix

@@ -36,7 +36,7 @@ in buildPythonPackage rec {
     six
   ];
 
-  # Tests are in <nixos/tests/blivet.nix>.
+  # Tests are in <nixpkgs/nixos/tests/blivet.nix>.
   doCheck = false;
 
   meta = with stdenv.lib; {

pkgs/development/tools/analysis/checkstyle/default.nix

@@ -1,12 +1,12 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  version = "6.8.1";
+  version = "6.8.2";
   name = "checkstyle-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/checkstyle/${name}-bin.tar.gz";
-    sha256 = "12da8msz5459ra0g5smr8daqh88mfa653nn475acjp1ycsm395hv";
+    sha256 = "1r0wb8iqvmhvgxk1ya39x8b4ayd549bfxmnw26i84870hnqr179c";
   };
 
   installPhase = ''

pkgs/development/tools/build-managers/boot/default.nix

@@ -1,12 +1,12 @@
 { stdenv, fetchurl, makeWrapper, jdk }:
 
 stdenv.mkDerivation rec {
-  version = "2.0.0";
+  version = "2.2.0";
   name = "boot-${version}";
 
   src = fetchurl {
     url = "https://github.com/boot-clj/boot/releases/download/${version}/boot.sh";
-    sha256 = "0hvznr0z5ck32wpaqhjv2fr9365b8h0h8brnsmwijpv699l0rf1c";
+    sha256 = "0czavpdhmpgp20vywf326ix1f94dky51mqiwyblrmrd33d89qz9f";
   };
 
   inherit jdk;

pkgs/development/tools/misc/fswatch/default.nix

@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation rec {
   name = "fswatch-${version}";
-  version = "1.4.7";
+  version = "1.5.0";
 
   src = fetchFromGitHub {
     owner = "emcrisostomo";
     repo = "fswatch";
     rev = version;
-    sha256 = "0f6aa14v31gy3j7qx563ml37r8mylpbqfjrz2v5g44zrrg6086w7";
+    sha256 = "09np75m9df2nk7lc5y9wgq467ca6jsd2p5666d5rkzjvy6s0a51n";
   };
 
   buildInputs = [ autoreconfHook gettext libtool makeWrapper texinfo ];

pkgs/development/tools/phantomjs2/default.nix

@@ -0,0 +1,49 @@
+{ stdenv, fetchurl,
+  bison2, flex, fontconfig, freetype, gperf, icu, openssl, libjpeg, libpng, perl, python, ruby, sqlite
+}:
+
+stdenv.mkDerivation rec {
+  name = "phantomjs-${version}";
+  version = "2.0.0-20150528";
+
+  src = fetchurl {
+    url = "https://github.com/bprodoehl/phantomjs/archive/v2.0.0-20150528.tar.gz";
+    sha256 = "18h37bxxg25lacry9k3vb5yim057bqcxmsifw97jrjp7gzfx56v5";
+  };
+
+  buildInputs = [ bison2 flex fontconfig freetype gperf icu openssl libjpeg libpng perl python ruby sqlite ];
+
+  patchPhase = ''
+    patchShebangs .
+    sed -i -e 's|/bin/pwd|pwd|' src/qt/qtbase/configure 
+  '';
+
+  buildPhase = "./build.sh --confirm";
+
+  installPhase = ''
+    mkdir -p $out/share/doc/phantomjs
+    cp -a bin $out
+    cp -a ChangeLog examples LICENSE.BSD README.md third-party.txt $out/share/doc/phantomjs
+  '';
+
+  meta = {
+    description = "Headless WebKit with JavaScript API";
+    longDescription = ''
+      PhantomJS2 is a headless WebKit with JavaScript API.
+      It has fast and native support for various web standards:
+      DOM handling, CSS selector, JSON, Canvas, and SVG.
+
+      PhantomJS is an optimal solution for:
+      - Headless Website Testing
+      - Screen Capture
+      - Page Automation
+      - Network Monitoring
+    '';
+
+    homepage = http://phantomjs.org/;
+    license = stdenv.lib.licenses.bsd3;
+
+    maintainers = [ stdenv.lib.maintainers.aflatter ];
+    platforms = with stdenv.lib.platforms; darwin ++ linux;
+  };
+}

pkgs/development/web/iojs/default.nix

@@ -1,14 +1,14 @@
 { stdenv, fetchurl, python, utillinux, openssl_1_0_2, http-parser, zlib, libuv }:
 
 let
-  version = "2.5.0";
+  version = "3.0.0";
   inherit (stdenv.lib) optional maintainers licenses platforms;
 in stdenv.mkDerivation {
   name = "iojs-${version}";
 
   src = fetchurl {
     url = "https://iojs.org/dist/v${version}/iojs-v${version}.tar.gz";
-    sha256 = "0jj0xqwpq7s45bycs406ml12xyknxgad4vyw9k84al3551m5y2wd";
+    sha256 = "0maxxmr6y7z3y3r88nhcnfzmpvbhs5p8knyz886bh2shgzd6nzqf";
   };
 
   prePatch = ''

pkgs/servers/http/yaws/default.nix

@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "yaws-${version}";
-  version = "1.99";
+  version = "2.0";
 
   src = fetchurl {
     url = "http://yaws.hyber.org/download/${name}.tar.gz";
-    sha256 = "057ymg84ji4pfi3xai6kis3mk8zks2ynbiam0x68cb4cb1yfzwcl";
+    sha256 = "1gwk44a07n7yvg900yrlfc6qpvjl64k2h2hddd1jaaay8lgpcch6";
   };
 
   # The tarball includes a symlink yaws -> yaws-1.95, which seems to be

pkgs/shells/ipython/default.nix

@@ -13,12 +13,13 @@ assert qtconsoleSupport == true -> pyqt4 != null;
 assert pylabQtSupport == true -> pyqt4 != null;
 
 buildPythonPackage rec {
-  name = "ipython-3.1.0";
+  name = "ipython-${version}";
+  version = "3.2.1";
   namePrefix = "";
 
   src = fetchurl {
     url = "https://pypi.python.org/packages/source/i/ipython/${name}.tar.gz";
-    sha256 = "092nilrkr76l1mklnslgbw1cz7z1xabp1hz5s7cb30kgy39r482k";
+    sha256 = "c913adee7ae5b338055274c51a7d2b3cea468b5b316046fa520cd8a434b09177";
   };
 
   propagatedBuildInputs = [

pkgs/tools/filesystems/ceph/0.94-pre.nix

@@ -0,0 +1,13 @@
+{ callPackage, fetchgit, ... } @ args:
+
+callPackage ./generic.nix (args // rec {
+  version = "0.94.3";
+
+  src = fetchgit {
+    url = "https://github.com/ceph/ceph.git";
+    rev = "c19b0fc1aa2834ae3027b07a02aebe9639fc2ca7";
+    sha256 = "1h1y5jh2bszia622rmwdblb3cpkpd0mijahkaiasr30jwpkmzh0i";
+  };
+
+  patches = [ ./fix-pgrefdebugging.patch ];
+})

pkgs/tools/misc/gparted/default.nix

@@ -3,10 +3,10 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "gparted-0.22.0";
+  name = "gparted-0.23.0";
 
   src = fetchurl {
-    sha256 = "09vg5lxvh81x54ps5ayfjd4jl84wprn42i1wifnfmj44dqd5wxda";
+    sha256 = "0m57bni3nkbbqq920ydzvasy2qc5j6w6bdssyn12jk4157gxvlbz";
     url = "mirror://sourceforge/gparted/${name}.tar.bz2";
   };
 
@@ -22,9 +22,9 @@ stdenv.mkDerivation rec {
       partitions. GParted enables you to change the partition organization
       while preserving the partition contents.
     '';
-    homepage = http://gparted.sourceforge.net;
+    homepage = http://gparted.org;
     license = licenses.gpl2Plus;
-    platforms = with platforms; linux;
+    platforms = platforms.linux;
     maintainers = with maintainers; [ nckx ];
   };
 }

pkgs/tools/misc/screenfetch/default.nix

@@ -1,5 +1,5 @@
 { stdenv, fetchgit, makeWrapper
-, coreutils, gawk, procps, gnused, findutils, xdpyinfo, xprop
+, coreutils, gawk, procps, gnused, findutils, xdpyinfo, xprop, gnugrep
 }:
 
 stdenv.mkDerivation {
@@ -28,6 +28,7 @@ stdenv.mkDerivation {
       --prefix PATH : "${findutils}/bin" \
       --prefix PATH : "${xdpyinfo}/bin" \
       --prefix PATH : "${xprop}/bin" \
+      --prefix PATH : "${gnugrep}/bin"
   '';
 
   meta = {

pkgs/tools/networking/netsniff-ng/default.nix

@@ -2,7 +2,7 @@
 , libnetfilter_conntrack, libnl, libpcap, libsodium, liburcu, ncurses, perl
 , pkgconfig, zlib }:
 
-let version = "0.5.9-34-g95c4582"; in
+let version = "0.5.9-71-g77445f8"; in
 stdenv.mkDerivation {
   name = "netsniff-ng-${version}";
 
@@ -10,8 +10,8 @@ stdenv.mkDerivation {
   src = fetchFromGitHub rec {
     repo = "netsniff-ng";
     owner = repo;
-    rev = "95c4582b742fd4fa58e5f14971164b941b0f730d";
+    rev = "77445f81d451eef6b78b79a2bcc24d21d4be4178";
-    sha256 = "0anai392n8zx8vcjbjg776lbiwrv95x2dbd8rypbqfzmj8nhzric";
+    sha256 = "0ny9bph070mny6i9r0i3wsx2bsl53135n439ab6r9qk710xjz91j";
   };
 
   buildInputs = [ bison flex geoip geolite-legacy libcli libnet libnl

pkgs/tools/networking/strongswan/default.nix

@@ -1,5 +1,5 @@
 { stdenv, fetchurl, gmp, pkgconfig, python, autoreconfHook
-, curl, trousers, sqlite
+, curl, trousers, sqlite, iptables, libxml2, openresolv
 , enableTNC ? false }:
 
 stdenv.mkDerivation rec {
@@ -13,8 +13,8 @@ stdenv.mkDerivation rec {
   dontPatchELF = true;
 
   buildInputs =
-    [ gmp pkgconfig python autoreconfHook ]
+    [ gmp pkgconfig python autoreconfHook iptables ]
-    ++ stdenv.lib.optionals enableTNC [ curl trousers sqlite ];
+    ++ stdenv.lib.optionals enableTNC [ curl trousers sqlite libxml2 ];
 
   patches = [
     ./ext_auth-path.patch
@@ -22,14 +22,27 @@ stdenv.mkDerivation rec {
     ./updown-path.patch
   ];
 
+  postPatch = ''
+    substituteInPlace src/libcharon/plugins/resolve/resolve_handler.c --replace "/sbin/resolvconf" "${openresolv}/sbin/resolvconf"
+    '';
+
   configureFlags =
-    [ "--enable-swanctl" "--enable-cmd" ]
+    [ "--enable-swanctl" "--enable-cmd"
+      "--enable-farp" "--enable-dhcp"
+      "--enable-eap-sim" "--enable-eap-sim-file" "--enable-eap-simaka-pseudonym"
+      "--enable-eap-simaka-reauth" "--enable-eap-identity" "--enable-eap-md5"
+      "--enable-eap-gtc" "--enable-eap-aka" "--enable-eap-aka-3gpp2"
+      "--enable-eap-mschapv2" "--enable-xauth-eap" "--enable-ext-auth"
+      "--enable-forecast" "--enable-connmark" "--enable-acert"
+      "--enable-aesni" "--enable-af-alg" "--enable-rdrand" ]
+    ++ stdenv.lib.optional (stdenv.system == "i686-linux") "--enable-padlock" 
     ++ stdenv.lib.optionals enableTNC [
          "--disable-gmp" "--disable-aes" "--disable-md5" "--disable-sha1" "--disable-sha2" "--disable-fips-prf"
-         "--enable-curl" "--enable-openssl" "--enable-eap-identity" "--enable-eap-md5" "--enable-eap-mschapv2"
+         "--enable-curl" "--enable-openssl"
          "--enable-eap-tnc" "--enable-eap-ttls" "--enable-eap-dynamic" "--enable-tnccs-20"
          "--enable-tnc-imc" "--enable-imc-os" "--enable-imc-attestation"
          "--enable-tnc-imv" "--enable-imv-attestation"
+         "--enable-tnc-ifmap" "--enable-tnc-imc" "--enable-tnc-imv"
          "--with-tss=trousers"
          "--enable-aikgen"
          "--enable-sqlite" ];

pkgs/tools/networking/vpnc/default.nix

@@ -1,24 +1,33 @@
-{ stdenv, fetchurl, nettools, libgcrypt, perl, gawk, makeWrapper }:
+{ stdenv, fetchsvn, nettools, libgcrypt, openssl, openresolv, perl, gawk, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "vpnc-0.5.3";
+  name = "vpnc-rev550";
-  src = fetchurl {
+  src = fetchsvn {
-    url = "http://www.unix-ag.uni-kl.de/~massar/vpnc/${name}.tar.gz";
+    url = "http://svn.unix-ag.uni-kl.de/vpnc";
-    sha256 = "1128860lis89g1s21hqxvap2nq426c9j4bvgghncc1zj0ays7kj6";
+    rev = "550";
+    sha256 = "0x4ckfv9lpykwmh28v1kyzz91y1j2v48fi8q5nsawrba4q0wlrls";
   };
 
-  patches = [ ./makefile.patch ./vpnc-script.patch ];
+  postUnpack = ''
+    mv $sourceRoot/trunk/* $sourceRoot/.
+    rm -r $sourceRoot/{trunk,branches,tags}
+  '';
+
+  patches = [ ./makefile.patch ];
 
   # The `etc/vpnc/vpnc-script' script relies on `which' and on
   # `ifconfig' as found in net-tools (not GNU Inetutils).
   propagatedBuildInputs = [ nettools ];
 
-  buildInputs = [libgcrypt perl makeWrapper];
+  buildInputs = [libgcrypt perl makeWrapper openssl ];
 
   preConfigure = ''
-    substituteInPlace "vpnc-script.in" \
+    sed -i 's|^#OPENSSL|OPENSSL|g' Makefile
+
+    substituteInPlace "vpnc-script" \
       --replace "which" "type -P" \
-      --replace "awk" "${gawk}/bin/awk"
+      --replace "awk" "${gawk}/bin/awk" \
+      --replace "/sbin/resolvconf" "${openresolv}/bin/resolvconf"
 
     substituteInPlace "config.c" \
       --replace "/etc/vpnc/vpnc-script" "$out/etc/vpnc/vpnc-script"

pkgs/tools/networking/vpnc/vpnc-script.patch

@@ -1,12 +0,0 @@
-diff -ubr vpnc-0.5.3-orig/vpnc-script.in vpnc-0.5.3/vpnc-script.in
---- vpnc-0.5.3-orig/vpnc-script.in	2012-02-29 23:03:35.289636602 +0100
-+++ vpnc-0.5.3/vpnc-script.in	2012-02-29 23:03:59.597307445 +0100
-@@ -116,7 +116,7 @@
- 
- if [ -n "$IPROUTE" ]; then
- 	fix_ip_get_output () {
--		sed 's/cache//;s/metric \?[0-9]\+ [0-9]\+//g;s/hoplimit [0-9]\+//g'
-+		sed 's/cache//;s/metric \?[0-9]\+ [0-9]\+//g;s/hoplimit [0-9]\+//g;s/ipid 0x....//g'
- 	}
- 
- 	set_vpngateway_route() {

pkgs/tools/package-management/nixops/unstable.nix

@@ -17,13 +17,13 @@ let
 in
 
 pythonPackages.buildPythonPackage rec {
-  name = "nixops-1.3pre1486_7489764";
+  name = "nixops-1.3pre-cefcd9ba";
   namePrefix = "";
 
   src = fetchgit {
     url = https://github.com/NixOS/nixops;
-    rev = "5c7663dfe1e2af9c0396c5c86d995452ef2efc8a";
+    rev = "cefcd9bae9a4d3bac83f188460619d18972321a8";
-    sha256 = "01n2ykszrnqr3kqqdg1n2l8wm38yhri7r3d7b0abklsslz9dlvmy";
+    sha256 = "1jwkbnfwics2j0m6mr75rz914vg0z46d2xv0z1717c1ac5rki0l2";
   };
 
   buildInputs = [ /* libxslt */ pythonPackages.nose pythonPackages.coverage ];

pkgs/tools/package-management/nixui/default.nix

@@ -2,7 +2,7 @@
 , profilePaths ? (config.nixui.profilePaths or ["/nix/var/nix/profiles"])
 , dataDir ? (config.nixui.dataDir or "/tmp")
 , configurations ? (config.nixui.configurations or ["/etc/nixos/configuration.nix"])
-, NIX_PATH ? (config.nixui.NIX_PATH or "/nix/var/nix/profiles/per-user/root/channels/nixos:nixpkgs=/etc/nixos/nixpkgs:nixos-config=/etc/nixos/configuration.nix") }:
+, NIX_PATH ? (config.nixui.NIX_PATH or "/nix/var/nix/profiles/per-user/root/channels/nixos:nixos-config=/etc/nixos/configuration.nix") }:
 let
   version = "0.1.2";
   src = fetchgit {

pkgs/top-level/all-packages.nix

@@ -1066,6 +1066,7 @@ let
   libceph = ceph.lib;
   ceph-0_80 = callPackage ../tools/filesystems/ceph/0.80.nix { };
   ceph-0_94 = callPackage ../tools/filesystems/ceph/0.94.nix { };
+  ceph-0_94-pre = callPackage ../tools/filesystems/ceph/0.94-pre.nix { };
   ceph = callPackage ../tools/filesystems/ceph { };
   ceph-dev = lowPrio (callPackage ../tools/filesystems/ceph/dev.nix { });
   ceph-git = lowPrio (callPackage ../tools/filesystems/ceph/git.nix { });
@@ -4007,7 +4008,7 @@ let
 
   haskell = callPackage ./haskell-packages.nix { };
 
-  haskellPackages = haskell.packages.ghc7101.override {
+  haskellPackages = haskell.packages.ghc7102.override {
     overrides = config.haskellPackageOverrides or (self: super: {});
   };
 
@@ -5685,6 +5686,8 @@ let
 
   phantomjs = callPackage ../development/tools/phantomjs { };
 
+  phantomjs2 = callPackage ../development/tools/phantomjs2 { };
+
   pmccabe = callPackage ../development/tools/misc/pmccabe { };
 
   /* Make pkgconfig always return a nativeDrv, never a proper crossDrv,
@@ -11492,14 +11495,13 @@ let
   gitAndTools = recurseIntoAttrs (import ../applications/version-management/git-and-tools {
     inherit pkgs;
   });
-  git = gitAndTools.git;
+
-  gitFull = gitAndTools.gitFull;
+  inherit (gitAndTools) git gitFull gitSVN git-cola svn2git;
+
   gitMinimal = git.override {
     withManual = false;
     pythonSupport = false;
   };
-  gitSVN = gitAndTools.gitSVN;
-  git-cola = gitAndTools.git-cola;
 
   gitRepo = callPackage ../applications/version-management/git-repo {
     python = python27;

pkgs/top-level/make-tarball.nix

@@ -74,7 +74,6 @@ releaseTools.sourceTarball rec {
     mkdir -p $out/tarballs
     mkdir ../$releaseName
     cp -prd . ../$releaseName
-    echo nixpkgs > ../$releaseName/channel-name
     (cd .. && tar cfa $out/tarballs/$releaseName.tar.xz $releaseName) || false
   '';
 

pkgs/top-level/python-packages.nix

@@ -9255,10 +9255,10 @@ let
 
   pgcli = buildPythonPackage rec {
     name = "pgcli-${version}";
-    version = "0.18.0";
+    version = "0.19.1";
 
     src = pkgs.fetchFromGitHub {
-      sha256 = "1ydi1725ryz9by770kyx06cwrvyvixbg3502brkf5hvbjd8ddzrl";
+      sha256 = "1r34bbqbd4h72cl0cxi9w6q2nwx806wpxq220mzyiy8g45xv0ghj";
       rev = "v${version}";
       repo = "pgcli";
       owner = "amjith";
@@ -9268,10 +9268,6 @@ let
       click configobj prompt_toolkit psycopg2 pygments sqlparse
     ];
 
-    postPatch = ''
-      substituteInPlace setup.py --replace "==" ">="
-    '';
-
     meta = {
       inherit version;
       description = "Command-line interface for PostgreSQL";
@@ -9571,10 +9567,10 @@ let
 
   prompt_toolkit = buildPythonPackage rec {
     name = "prompt_toolkit-${version}";
-    version = "0.43";
+    version = "0.45";
 
     src = pkgs.fetchurl {
-      sha256 = "1z5fap8c7q27p0s82jn11i6fwg0g9zm2zy5na8is53kgbhl10fdr";
+      sha256 = "19lp15rc0rq4jqaacg2a38cdgfy2avhf5v97yanasx4n2swx4gsm";
       url = "https://pypi.python.org/packages/source/p/prompt_toolkit/${name}.tar.gz";
     };
 
@@ -11607,19 +11603,19 @@ let
   };
 
   repocheck = buildPythonPackage rec {
-    name = "repocheck-2015-06-27";
+    name = "repocheck-2015-08-05";
     disabled = isPy26 || isPy27;
 
     src = pkgs.fetchFromGitHub {
-      sha256 = "0psihwph10sx07xc2gfch739laz7x1kwl5c991cci8cfn5jzy8bp";
+      sha256 = "1jc4v5zy7z7xlfmbfzvyzkyz893f5x2k6kvb3ni3rn2df7jqhc81";
-      rev = "231e05b4fa55955ef8492581a15f508ffa0037d4";
+      rev = "ee48d0e88d3f5814d24a8d1f22d5d83732824688";
       repo = "repocheck";
       owner = "kynikos";
     };
 
     meta = {
+      inherit (src.meta) homepage;
       description = "Check the status of code repositories under a root directory";
-      homepage = https://github.com/kynikos/repocheck;
       license = licenses.gpl3Plus;
       maintainers = with maintainers; [ nckx ];
     };