Fix merge conflicts

profiles/environment/common-software.nix

@@ -20,6 +20,9 @@ packages: {config, ...}: {
 		nixpkgs.autoconf
 
 		# Development tools
+		/* (unstable.atom.override {
+			gvfs = nixpkgs.gvfs;
+		}) */
 		unstable.atom
 		nixpkgs.geany
 		nixpkgs.sqlitebrowser
@@ -51,12 +54,11 @@ packages: {config, ...}: {
 		# Rust
 		/* nixpkgs.rustChannels.nightly.rust
 		nixpkgs.rustChannels.nightly.rust-src */
-		(nixpkgs.rustChannelOf { date = "2018-04-30"; channel = "nightly"; }).rust
-		(nixpkgs.rustChannelOf { date = "2018-04-30"; channel = "nightly"; }).rust-src
+		(nixpkgs.rustChannelOf { date = "2018-04-30"; channel = "nightly"; }).rust.override { extensions = [ "rust-src" ]; }
 
 		# Downloaders and filesharing
 		(unstable.python35Packages.youtube-dl.override {
-		ffmpeg = unstable.ffmpeg-full;
+			ffmpeg = unstable.ffmpeg-full;
 		})
 		unstable.megatools
 		nixpkgs.aria2
@@ -87,7 +89,7 @@ packages: {config, ...}: {
 		nixpkgs.keepassx2
 
 		# Chat and communication
-		nixpkgs.pidgin
+		(nixpkgs.pidgin.override {plugins = [nixpkgs.pidginotr];})
 		nixpkgs.konversation
 
 		# Productivity
@@ -163,12 +165,12 @@ packages: {config, ...}: {
 	nixpkgs.config = {
 		firefox = {
 			enableGoogleTalkPlugin = true;
-			#enableAdobeFlash = true;
+			/* enableAdobeFlash = true; */
 			jre = true;
 		};
 
 		chromium = {
-			#enablePepperFlash = true;
+			/* enablePepperFlash = true; */
 			enablePepperPDF = true;
 			jre = true;
 		};