Merge remote-tracking branch 'prism/lassulus'
This commit is contained in:
commit
789063319e
@ -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;
|
||||
}
|
@ -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 {
|
||||
|
@ -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" ];
|
||||
|
@ -172,7 +172,6 @@ in {
|
||||
"hashPassword",
|
||||
"haskellPackages.blessings",
|
||||
"haskellPackages.email-header",
|
||||
"haskellPackages.megaparsec",
|
||||
"haskellPackages.scanner",
|
||||
"haskellPackages.xmonad-stockholm",
|
||||
"krebspaste",
|
||||
|
Loading…
Reference in New Issue
Block a user