From 58c854c657b0bcbfc7e34b743cdba18675221e32 Mon Sep 17 00:00:00 2001 From: tv Date: Thu, 6 Oct 2016 19:16:42 +0200 Subject: tv nixpkgs: 2568ee3 -> 45b2a6d --- krebs/5pkgs/charybdis/default.nix | 2 +- krebs/5pkgs/dic/default.nix | 2 +- krebs/5pkgs/haskell-overrides/blessings.nix | 2 +- krebs/5pkgs/haskell-overrides/email-header.nix | 2 +- krebs/5pkgs/haskell-overrides/scanner.nix | 2 +- krebs/5pkgs/much/default.nix | 2 +- krebs/5pkgs/noVNC/default.nix | 2 +- tv/1systems/xu.nix | 4 ++-- tv/2configs/default.nix | 7 ++++--- tv/2configs/hw/x220.nix | 5 +++-- tv/2configs/man.nix | 10 +++++----- tv/2configs/vim.nix | 2 +- 12 files changed, 22 insertions(+), 20 deletions(-) diff --git a/krebs/5pkgs/charybdis/default.nix b/krebs/5pkgs/charybdis/default.nix index f3e6be40..6968be26 100644 --- a/krebs/5pkgs/charybdis/default.nix +++ b/krebs/5pkgs/charybdis/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { src = fetchgit { url = "https://github.com/atheme/charybdis.git"; rev = "61815bf9324e872f51255e09fe37a8c595f94a60"; - sha256 = "0zsd6xk2cnspc1cvryy2296p3ix4hwjd9k24wmgbh5wzks0wahwy"; + sha256 = "1q9h7j2pm1wsbcybmm7r7hzimp1zda04lw9x2akb26l9p12zgfgc"; }; patches = [ diff --git a/krebs/5pkgs/dic/default.nix b/krebs/5pkgs/dic/default.nix index 3566de8c..12cbedc6 100644 --- a/krebs/5pkgs/dic/default.nix +++ b/krebs/5pkgs/dic/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation { src = fetchgit { url = https://github.com/krebscode/painload; rev = "35ccac73d563ad30d2851b9aeed4cfef69ff74e3"; - sha256 = "1y1fs2p3xj2yrqpw0h5kd0f3c5p1y70xk1hjnw99sr33r67s9c35"; + sha256 = "0arsfcd8qdrqafw7cxiag7f0kn95nwxxwrs0kdzxxdryfr6l1h07"; }; phases = [ diff --git a/krebs/5pkgs/haskell-overrides/blessings.nix b/krebs/5pkgs/haskell-overrides/blessings.nix index 741fb5c3..ba776b35 100644 --- a/krebs/5pkgs/haskell-overrides/blessings.nix +++ b/krebs/5pkgs/haskell-overrides/blessings.nix @@ -5,7 +5,7 @@ mkDerivation { src = fetchgit { url = http://cgit.cd.krebsco.de/blessings; rev = "25a510dcb38ea9158e9969d56eb66cb1b860ab5f"; - sha256 = "b962153e80e51519b52220199d8350b54154833e4bc25a792ecc58898fef3fb2"; + sha256 = "0xg329h1y68ndg4w3m1jp38pkg3gqg7r19q70gqqj4mswb6qcrqc"; }; libraryHaskellDepends = [ base ]; doHaddock = false; diff --git a/krebs/5pkgs/haskell-overrides/email-header.nix b/krebs/5pkgs/haskell-overrides/email-header.nix index 8c62f2f7..b5424080 100644 --- a/krebs/5pkgs/haskell-overrides/email-header.nix +++ b/krebs/5pkgs/haskell-overrides/email-header.nix @@ -7,8 +7,8 @@ mkDerivation { version = "0.3.0"; src = fetchgit { url = "https://github.com/4z3/email-header"; - sha256 = "f33fba567a39b1f2448869b269c26c40d8007599c23ab83bde5b4dfd9fd76ebc"; rev = "7b179bd31192ead8afe7a0b6e34bcad4039deaa8"; + sha256 = "12j2n3sbvzjnw99gga7kkdygm8n3qx2lh8q26ad6a53xm5whnz59"; }; buildDepends = [ attoparsec base base64-bytestring bytestring case-insensitive diff --git a/krebs/5pkgs/haskell-overrides/scanner.nix b/krebs/5pkgs/haskell-overrides/scanner.nix index b88b9dbe..5146fa41 100644 --- a/krebs/5pkgs/haskell-overrides/scanner.nix +++ b/krebs/5pkgs/haskell-overrides/scanner.nix @@ -5,7 +5,7 @@ mkDerivation { src = fetchgit { url = http://cgit.cd.krebsco.de/scanner; rev = "7f091a3bc152ad3974a1873b460fa1759bf8dcad"; - sha256 = "7d123c227777932039d26fc832b8d32a90f04c0bd6b7e8bcff0a6f49a54e0054"; + sha256 = "1lgl158axczsm4fx53fyq1d4116v91jsx4dbz66ka4k1ljqrmhgn"; }; libraryHaskellDepends = [ base ]; license = stdenv.lib.licenses.wtfpl; diff --git a/krebs/5pkgs/much/default.nix b/krebs/5pkgs/much/default.nix index efe84fbf..61a58b01 100644 --- a/krebs/5pkgs/much/default.nix +++ b/krebs/5pkgs/much/default.nix @@ -14,7 +14,7 @@ mkDerivation { src = fetchgit { url = "http://cgit.cd.krebsco.de/much"; rev = "045dc986b4de225a927175f81c8ccfdab450202c"; - sha256 = "cec175e3dc32ef93029ee5285f6c4042ce11d637945bc8cec02cb6699d06cc13"; + sha256 = "17jbw7x82a3bgn1qv5k764f103knrf865dmx48h7192vdh8gz766"; }; isLibrary = false; isExecutable = true; diff --git a/krebs/5pkgs/noVNC/default.nix b/krebs/5pkgs/noVNC/default.nix index 629d288a..45c3afb3 100644 --- a/krebs/5pkgs/noVNC/default.nix +++ b/krebs/5pkgs/noVNC/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { src = fetchgit { url = https://github.com/kanaka/noVNC; rev = "refs/tags/v0.5.1"; - sha256 = "1azsnppwnrsv3axj0r5bw8lfarkibgz5vhgcyj8dzn4afn98f55w"; + sha256 = "1vckvvfcawgfqmx415r5rnl6k2alx53jbqmsj49kxpbdvvxpb49d"; }; phases = [ diff --git a/tv/1systems/xu.nix b/tv/1systems/xu.nix index 642593fc..119399ac 100644 --- a/tv/1systems/xu.nix +++ b/tv/1systems/xu.nix @@ -24,7 +24,7 @@ with config.krebs.lib; # stockholm gnumake hashPassword - haskellPackages.lentil + #haskellPackages.lentil parallel (pkgs.writeBashBin "im" '' export PATH=${makeSearchPath "bin" (with pkgs; [ @@ -60,7 +60,7 @@ with config.krebs.lib; pass q qrencode - texLive + #texLive tmux #ack diff --git a/tv/2configs/default.nix b/tv/2configs/default.nix index db1bfe5a..7d454e2b 100644 --- a/tv/2configs/default.nix +++ b/tv/2configs/default.nix @@ -14,7 +14,7 @@ with config.krebs.lib; stockholm.file = "/home/tv/stockholm"; nixpkgs.git = { url = https://github.com/NixOS/nixpkgs; - ref = "2568ee3d73bdebd6bab6739adf8a900f3429c8e6"; + ref = "45b2a6d88299bb5671e36a4239ec0097bc149fb3"; }; } // optionalAttrs host.secure { secrets-master.file = "/home/tv/secrets/master"; @@ -37,6 +37,7 @@ with config.krebs.lib; # stockholm dependencies environment.systemPackages = with pkgs; [ git + populate ]; } { @@ -63,13 +64,13 @@ with config.krebs.lib; { # TODO check if both are required: - nix.chrootDirs = [ "/etc/protocols" pkgs.iana_etc.outPath ]; + nix.sandboxPaths = [ "/etc/protocols" pkgs.iana_etc.outPath ]; nix.requireSignedBinaryCaches = true; nix.binaryCaches = ["https://cache.nixos.org"]; - nix.useChroot = true; + nix.useSandbox = true; } { nixpkgs.config.allowUnfree = false; diff --git a/tv/2configs/hw/x220.nix b/tv/2configs/hw/x220.nix index c5a3485a..6cc295dc 100644 --- a/tv/2configs/hw/x220.nix +++ b/tv/2configs/hw/x220.nix @@ -5,7 +5,7 @@ ../smartd.nix ]; - boot.loader.gummiboot.enable = true; + boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = true; networking.wireless.enable = true; @@ -13,6 +13,8 @@ # Required for Centrino. hardware.enableAllFirmware = true; + hardware.opengl.extraPackages = [ pkgs.vaapiIntel pkgs.vaapiVdpau ]; + hardware.trackpoint = { enable = true; sensitivity = 220; @@ -41,6 +43,5 @@ services.xserver = { videoDriver = "intel"; - vaapiDrivers = [ pkgs.vaapiIntel pkgs.vaapiVdpau ]; }; } diff --git a/tv/2configs/man.nix b/tv/2configs/man.nix index a84e60b7..6534e2c0 100644 --- a/tv/2configs/man.nix +++ b/tv/2configs/man.nix @@ -1,10 +1,10 @@ { config, lib, pkgs, ... }: { - environment.etc."man.conf".source = pkgs.runCommand "man.conf" {} '' - ${pkgs.gnused}/bin/sed <${pkgs.man}/lib/man.conf >$out ' - s:^NROFF\t.*:& -Wbreak: - ' - ''; + #environment.etc."man.conf".source = pkgs.runCommand "man.conf" {} '' + # ${pkgs.gnused}/bin/sed <${pkgs.man}/lib/man.conf >$out ' + # s:^NROFF\t.*:& -Wbreak: + # ' + #''; environment.systemPackages = with pkgs; [ manpages posix_man_pages diff --git a/tv/2configs/vim.nix b/tv/2configs/vim.nix index 86c5d05d..16f54048 100644 --- a/tv/2configs/vim.nix +++ b/tv/2configs/vim.nix @@ -21,7 +21,7 @@ let src = pkgs.fetchgit { url = https://github.com/vito-c/jq.vim; rev = "99d55a300047946a82ecdd7617323a751199ad2d"; - sha256 = "00mmwg4swwmllknzzx07af080lcy7y5i6341rc6c08i2vka48nv9"; + sha256 = "09c94nah47wx0cr556w61h6pfznxld18pfblc3nv51ivbw7cjqyx"; }; }) (pkgs.vimUtils.buildVimPlugin { -- cgit v1.2.3