diff options
| -rw-r--r-- | krebs/5pkgs/haskell-overrides/megaparsec.nix | 20 | ||||
| -rw-r--r-- | krebs/5pkgs/newsbot-js/default.nix | 6 | ||||
| -rw-r--r-- | lass/1systems/uriel.nix | 6 | ||||
| -rw-r--r-- | lass/2configs/buildbot-standalone.nix | 1 |
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 5ade6006..00000000 --- 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 9e4a5130..b52454ca 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 aa5286ae..e1417c83 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 2fc3d373..628fdf61 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", |