From aaa2572293e1c4d4ff1ea3e04c47df92bb7e0d94 Mon Sep 17 00:00:00 2001
From: Gabriel Ebner <gebner@gebner.org>
Date: Sat, 7 Oct 2017 21:28:43 +0200
Subject: [PATCH] Move many packages to stable so that I can test mesa more
 easily

---
 archachatina.nix    |  4 ++--
 common-headless.nix |  2 +-
 common-sw.nix       |  8 ++++----
 i3.nix              |  2 +-
 large-sw.nix        | 10 +++++-----
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/archachatina.nix b/archachatina.nix
index 8e01110..f4c46b0 100644
--- a/archachatina.nix
+++ b/archachatina.nix
@@ -51,7 +51,7 @@
   virtualisation.docker.enable = true;
   users.extraUsers.gebner.extraGroups = [ "docker" "libvirtd" ];
 
-  virtualisation.virtualbox.host.enable = true;
+  # virtualisation.virtualbox.host.enable = true;
 
   # virtualisation.libvirtd.enable = true;
   networking.firewall.checkReversePath = false;
@@ -73,7 +73,7 @@
   services.openssh.forwardX11 = true;
 
   nixpkgs.config.packageOverrides = super: let self = super.pkgs; in {
-    mesa_drivers = self.stable.mesa_drivers;
+    # mesa_drivers = self.stable.mesa_drivers;
   #     mesa_drivers = self.mesaDarwinOr (
   #       let mo = self.mesa_noglu.override {
   #             llvmPackages = pkgs.llvmPackages_39;
diff --git a/common-headless.nix b/common-headless.nix
index 3bc9b2d..cd265d1 100644
--- a/common-headless.nix
+++ b/common-headless.nix
@@ -36,7 +36,7 @@
   services.printing = {
     enable = true;
     browsing = true;
-    drivers = [ pkgs.hplip ];
+    drivers = [ pkgs.stable.hplip ];
   };
   # services.colord.enable = true;
 
diff --git a/common-sw.nix b/common-sw.nix
index 94f7786..3dc03b1 100644
--- a/common-sw.nix
+++ b/common-sw.nix
@@ -8,7 +8,7 @@
     subversion
     openjdk8
     sbt scala
-    chromium
+    stable.chromium
     qalculate-gtk
     speedcrunch
     viewnior
@@ -20,9 +20,9 @@
     hledger-diff
     cmake ninja
     mpv
-    wireshark-gtk
+    stable.wireshark-gtk
     neomutt notmuch
-    goldendict
+    stable.goldendict
     patchelf
     bazaar
     tokei loc
@@ -69,7 +69,7 @@
     metis-prover
     spass
     z3
-    cvc4
+    stable.cvc4
     graphviz
     # toysolver
     oldstable.haskellPackages.tip-lib
diff --git a/i3.nix b/i3.nix
index c56b00d..15675da 100644
--- a/i3.nix
+++ b/i3.nix
@@ -60,7 +60,7 @@
       ubuntu_font_family
       source-code-pro
       fira
-      noto-fonts-emoji
+      stable.noto-fonts-emoji
 
       cantarell_fonts # from gnome3 module
     ];
diff --git a/large-sw.nix b/large-sw.nix
index 75e39dc..551b982 100644
--- a/large-sw.nix
+++ b/large-sw.nix
@@ -5,11 +5,11 @@
     idea-community-eap
     clion-eap
     texlive.combined.scheme-full biber
-    gimp
-    inkscape
+    stable.gimp
+    stable.inkscape
     jabref
-    libreoffice-fresh
-    calibre
+    stable.libreoffice-fresh
+    stable.calibre
 
     # qutebrowser
 
@@ -20,7 +20,7 @@
 
     stack
 
-    coq_8_6
+    stable.coq_8_6
 
     # cargo rustc
   ] ++ (with aspellDicts; [ en de fr nl ]);