summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregor Kleen <gkleen@yggdrasil.li>2018-04-10 15:23:16 +0200
committerGregor Kleen <gkleen@yggdrasil.li>2018-04-10 15:23:16 +0200
commitb6b0c5204688e614c99af2f9c95587bba36bedae (patch)
tree90227969ecd60122b08994f1e9f641945e1c0131
parente9c990d347c63f2031a487deafe90e0c1d0f25e8 (diff)
downloadnixos-b6b0c5204688e614c99af2f9c95587bba36bedae.tar
nixos-b6b0c5204688e614c99af2f9c95587bba36bedae.tar.gz
nixos-b6b0c5204688e614c99af2f9c95587bba36bedae.tar.bz2
nixos-b6b0c5204688e614c99af2f9c95587bba36bedae.tar.xz
nixos-b6b0c5204688e614c99af2f9c95587bba36bedae.zip
bragi
-rw-r--r--bragi.nix3
-rw-r--r--bragi/bar/default.nix15
2 files changed, 17 insertions, 1 deletions
diff --git a/bragi.nix b/bragi.nix
index 2a52e2f4..bed89baa 100644
--- a/bragi.nix
+++ b/bragi.nix
@@ -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
7let 7let
@@ -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 };
24in stdenv.lib.overrideDerivation pkg (drv: { 37in stdenv.lib.overrideDerivation pkg (drv: {
25 postUnpack = '' 38 postUnpack = ''
26 ( 39 (