diff options
-rw-r--r-- | bragi.nix | 3 | ||||
-rw-r--r-- | bragi/bar/default.nix | 15 |
2 files changed, 17 insertions, 1 deletions
@@ -302,6 +302,9 @@ in rec { | |||
302 | 302 | ||
303 | services.samba = { | 303 | services.samba = { |
304 | enable = true; | 304 | enable = true; |
305 | extraConfig = '' | ||
306 | workgroup = ASGARD | ||
307 | ''; | ||
305 | }; | 308 | }; |
306 | 309 | ||
307 | users.extraUsers.root = let | 310 | users.extraUsers.root = let |
diff --git a/bragi/bar/default.nix b/bragi/bar/default.nix index bbfa170c..2f80d777 100644 --- a/bragi/bar/default.nix +++ b/bragi/bar/default.nix | |||
@@ -1,7 +1,7 @@ | |||
1 | { haskellPackages | 1 | { haskellPackages |
2 | , stdenv | 2 | , stdenv |
3 | , fetchFromGitHub | 3 | , fetchFromGitHub |
4 | , jquery | 4 | , fetchurl |
5 | }: | 5 | }: |
6 | 6 | ||
7 | let | 7 | let |
@@ -21,6 +21,19 @@ let | |||
21 | cp -r $src/js-webshim/dev/* $out/js/ | 21 | cp -r $src/js-webshim/dev/* $out/js/ |
22 | ''; | 22 | ''; |
23 | }; | 23 | }; |
24 | jquery = stdenv.mkDerivation rec { | ||
25 | name = "jquery-${version}"; | ||
26 | version = "3.3.1"; | ||
27 | src = fetchurl { | ||
28 | url = "https://github.com/jquery/jquery/archive/${version}.tar.gz"; | ||
29 | sha256 = "1d1pilrwiz0yjx27cd7gbn8qar6hw5zgwjhpsyaijcg52z82wi5q"; | ||
30 | }; | ||
31 | |||
32 | installPhase = '' | ||
33 | mkdir -p $out/js | ||
34 | cp -r $src/${name}/dist/jquery.js $out/js/ | ||
35 | ''; | ||
36 | }; | ||
24 | in stdenv.lib.overrideDerivation pkg (drv: { | 37 | in stdenv.lib.overrideDerivation pkg (drv: { |
25 | postUnpack = '' | 38 | postUnpack = '' |
26 | ( | 39 | ( |