summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2016-10-20 10:01:19 +0200
committermakefu <github@syntax-fehler.de>2016-10-20 10:01:19 +0200
commit789063319e78a9e2c1df6cf4a436a188886887ae (patch)
treec32a3c15559a6dc1bd6503cf01c876b300c1eeef
parent3ceb087cc8c7475e98ceac70f82dee2e46e9a85d (diff)
parent0f2a9778315c3126794c0f1ad63710d38e7a67f7 (diff)
Merge remote-tracking branch 'prism/lassulus'
-rw-r--r--krebs/5pkgs/haskell-overrides/megaparsec.nix20
-rw-r--r--krebs/5pkgs/newsbot-js/default.nix6
-rw-r--r--lass/1systems/uriel.nix6
-rw-r--r--lass/2configs/buildbot-standalone.nix1
4 files changed, 7 insertions, 26 deletions
diff --git a/krebs/5pkgs/haskell-overrides/megaparsec.nix b/krebs/5pkgs/haskell-overrides/megaparsec.nix
deleted file mode 100644
index 5ade6006e..000000000
--- a/krebs/5pkgs/haskell-overrides/megaparsec.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ mkDerivation, base, bytestring, fetchzip, HUnit, mtl, QuickCheck
-, stdenv, test-framework, test-framework-hunit
-, test-framework-quickcheck2, text, transformers
-}:
-mkDerivation {
- pname = "megaparsec";
- version = "4.1.0";
- src = fetchzip {
- url = "https://hackage.haskell.org/package/megaparsec-4.1.0/megaparsec-4.1.0.tar.gz";
- sha256 = "1a1ka53a3r91lwnlvzaa8nyk1dxvfd1ij1i5x5vp83q2r9z9dcmi";
- };
- libraryHaskellDepends = [ base bytestring mtl text transformers ];
- testHaskellDepends = [
- base HUnit mtl QuickCheck test-framework test-framework-hunit
- test-framework-quickcheck2 transformers
- ];
- homepage = "https://github.com/mrkkrp/megaparsec";
- description = "Monadic parser combinators";
- license = stdenv.lib.licenses.bsd3;
-}
diff --git a/krebs/5pkgs/newsbot-js/default.nix b/krebs/5pkgs/newsbot-js/default.nix
index 9e4a51306..b52454ca4 100644
--- a/krebs/5pkgs/newsbot-js/default.nix
+++ b/krebs/5pkgs/newsbot-js/default.nix
@@ -1,9 +1,9 @@
-{ stdenv, makeWrapper, lib, buildEnv, fetchgit, nodePackages, nodejs }:
+{ stdenv, makeWrapper, callPackage, lib, buildEnv, fetchgit, nodePackages, nodejs }:
with lib;
let
- np = nodePackages.override {
+ np = (callPackage <nixpkgs/pkgs/top-level/node-packages.nix>) {
generated = ./packages.nix;
self = np;
};
@@ -21,7 +21,7 @@ let
ignoreCollisions = true;
};
-in nodePackages.buildNodePackage {
+in np.buildNodePackage {
name = "newsbot-js";
src = fetchgit {
diff --git a/lass/1systems/uriel.nix b/lass/1systems/uriel.nix
index aa5286ae0..e1417c83d 100644
--- a/lass/1systems/uriel.nix
+++ b/lass/1systems/uriel.nix
@@ -9,6 +9,7 @@ with config.krebs.lib;
../2configs/exim-retiolum.nix
{
# locke config
+ i18n.defaultLocale ="de_DE.UTF-8";
time.timeZone = "Europe/Berlin";
services.xserver.enable = true;
users.users.locke = {
@@ -28,6 +29,7 @@ with config.krebs.lib;
systemWide = true;
};
environment.systemPackages = with pkgs; [
+ pavucontrol
firefox
hexchat
networkmanagerapplet
@@ -51,8 +53,8 @@ with config.krebs.lib;
#loader.grub.version = 2;
#loader.grub.device = "/dev/sda";
- loader.gummiboot.enable = true;
- loader.gummiboot.timeout = 5;
+ loader.systemd-boot.enable = true;
+ loader.timeout = 5;
initrd.luks.devices = [ { name = "luksroot"; device = "/dev/sda2"; } ];
initrd.luks.cryptoModules = [ "aes" "sha512" "sha1" "xts" ];
diff --git a/lass/2configs/buildbot-standalone.nix b/lass/2configs/buildbot-standalone.nix
index 2fc3d3732..628fdf61f 100644
--- a/lass/2configs/buildbot-standalone.nix
+++ b/lass/2configs/buildbot-standalone.nix
@@ -172,7 +172,6 @@ in {
"hashPassword",
"haskellPackages.blessings",
"haskellPackages.email-header",
- "haskellPackages.megaparsec",
"haskellPackages.scanner",
"haskellPackages.xmonad-stockholm",
"krebspaste",