gebner/nixos-config
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

archachatina: use stable mesa drivers to prevent driver crash

Browse Source
This commit is contained in:
Gabriel Ebner 2017-10-07 14:45:39 +02:00
parent 776f46612b
commit 6494a1737a
2 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
archachatina.nix
View File

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

13
common-sw.nix
View File

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