Move many packages to stable so that I can test mesa more easily

archachatina.nix

@@ -42,6 +42,8 @@
 
     recoll
     uvccapture
+
+    # libratbag
   ];
 
   services.thermald.enable = true;
@@ -49,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;
@@ -70,7 +72,8 @@
 
   services.openssh.forwardX11 = true;
 
-  # nixpkgs.config.packageOverrides = super: let self = super.pkgs; in {
+  nixpkgs.config.packageOverrides = super: let self = super.pkgs; in {
+    # mesa_drivers = self.stable.mesa_drivers;
   #     mesa_drivers = self.mesaDarwinOr (
   #       let mo = self.mesa_noglu.override {
   #             llvmPackages = pkgs.llvmPackages_39;
@@ -79,13 +82,15 @@
   #           };
   #       in mo.drivers
   #     );
-  # };
+  };
 
-  #boot.kernelPackages = pkgs.lib.mkOverride 10 pkgs.linuxPackages_latest;
+  # boot.kernelPackages = pkgs.lib.mkOverride 10 pkgs.linuxPackages;
 
   services.xserver = {
     videoDrivers = [ "amdgpu" ];
-    # useGlamor = true;
+    deviceSection = ''
+      Option "TearFree" "on"
+    '';
   };
 
   services.transmission.enable = true;

common-headless.nix

@@ -36,7 +36,7 @@
   services.printing = {
     enable = true;
     browsing = true;
-    drivers = [ pkgs.hplip ];
+    drivers = [ pkgs.stable.hplip ];
   };
   # services.colord.enable = true;
 

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,14 +69,15 @@
     metis-prover
     spass
     z3
-    cvc4
+    stable.cvc4
     graphviz
     # toysolver
-    stable.haskellPackages.tip-lib
+    oldstable.haskellPackages.tip-lib
 
     emacsPackages.proofgeneral
 
-    stablePkgs # protect nixpkgs checkout from GC
+    oldstablePkgs # protect nixpkgs checkout from GC
+    stablePkgs
   ] ++ (with aspellDicts; [ en de fr nl ]);
 
   nixpkgs.config.packageOverrides = pkgs: with pkgs; let
@@ -86,10 +87,14 @@
       owner = "NixOS";
       repo = "nixpkgs-channels";
     };
-    stablePkgs = fetchNixPkgs {
+    oldstablePkgs = fetchNixPkgs {
       rev = "5237768d62a40236d24fafbd9f4f97f3227399ce";
       sha256 = "1j707pwm6ll2cvmqvwfxxq21gd9q7l6s3vi3vc01jklplj2v20is";
     };
+    stablePkgs = fetchNixPkgs {
+      rev = "19879836d10f64a10658d1e2a84fc54b090e2087";
+      sha256 = "1x41ch2mgzs85ivvyp3zqkbh4i0winjg69g5x0p3q7avgrhkl7ph";
+    };
   in {
     # idea-community-eap = pkgs.idea.idea-community.overrideDerivation (oldAttrs: rec {
     #     name = "idea-community-${version}";
@@ -115,6 +120,8 @@
     #   extraPythonPackages = [ pkgs.pythonPackages.websocket_client ];
     # };
 
+    oldstablePkgs = oldstablePkgs;
+    oldstable = import oldstablePkgs {};
     stablePkgs = stablePkgs;
     stable = import stablePkgs {};
 

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
     ];

large-sw.nix

@@ -5,11 +5,11 @@
     idea-community-eap
     clion-eap
     texlive.combined.scheme-full biber
-    gimp
+    stable.gimp
-    inkscape
+    stable.inkscape
     jabref
-    libreoffice-fresh
+    stable.libreoffice-fresh
-    calibre
+    stable.calibre
 
     # qutebrowser
 
@@ -20,7 +20,7 @@
 
     stack
 
-    coq_8_6
+    stable.coq_8_6
 
     # cargo rustc
   ] ++ (with aspellDicts; [ en de fr nl ]);