diff options
author | Gregor Kleen <gkleen@yggdrasil.li> | 2018-09-08 14:37:34 +0200 |
---|---|---|
committer | Gregor Kleen <gkleen@yggdrasil.li> | 2018-09-08 14:37:34 +0200 |
commit | c88ee737b8c44162c640a4c865336c5a843029ea (patch) | |
tree | 05d83de63566305ddb397fe1453ceeb986ac6847 /bragi/bar | |
parent | cab8330b015ab19758b0051c417c345474dcb01f (diff) | |
download | nixos-c88ee737b8c44162c640a4c865336c5a843029ea.tar nixos-c88ee737b8c44162c640a4c865336c5a843029ea.tar.gz nixos-c88ee737b8c44162c640a4c865336c5a843029ea.tar.bz2 nixos-c88ee737b8c44162c640a4c865336c5a843029ea.tar.xz nixos-c88ee737b8c44162c640a4c865336c5a843029ea.zip |
Simplify bragi, move bar to odin
Diffstat (limited to 'bragi/bar')
-rw-r--r-- | bragi/bar/default.nix | 47 | ||||
-rw-r--r-- | bragi/bar/generated.nix | 35 | ||||
-rw-r--r-- | bragi/bar/generated.nix.gup | 5 |
3 files changed, 0 insertions, 87 deletions
diff --git a/bragi/bar/default.nix b/bragi/bar/default.nix deleted file mode 100644 index 98b36901..00000000 --- a/bragi/bar/default.nix +++ /dev/null | |||
@@ -1,47 +0,0 @@ | |||
1 | { haskellPackages | ||
2 | , stdenv | ||
3 | , fetchFromGitHub | ||
4 | , fetchurl | ||
5 | , haskell | ||
6 | }: | ||
7 | |||
8 | let | ||
9 | pkg = haskellPackages.callPackage ./generated.nix {}; | ||
10 | webshim = stdenv.mkDerivation rec { | ||
11 | name = "webshim-${version}"; | ||
12 | version = "1.16.0"; | ||
13 | src = fetchFromGitHub { | ||
14 | owner = "aFarkas"; | ||
15 | repo = "webshim"; | ||
16 | rev = "1.16.0"; | ||
17 | sha256 = "14pk7hljqipzp0n7vpgcfxr3w4bla57cwyd7bmwmmxrm2zn62cyh"; | ||
18 | }; | ||
19 | |||
20 | installPhase = '' | ||
21 | mkdir -p $out/js | ||
22 | cp -r $src/js-webshim/dev/* $out/js/ | ||
23 | ''; | ||
24 | }; | ||
25 | jquery = stdenv.mkDerivation rec { | ||
26 | name = "jquery-${version}"; | ||
27 | version = "3.3.1"; | ||
28 | src = fetchurl { | ||
29 | url = "https://github.com/jquery/jquery/archive/${version}.tar.gz"; | ||
30 | sha256 = "1d1pilrwiz0yjx27cd7gbn8qar6hw5zgwjhpsyaijcg52z82wi5q"; | ||
31 | }; | ||
32 | |||
33 | installPhase = '' | ||
34 | mkdir -p $out/js | ||
35 | cp -r dist/jquery.js $out/js/ | ||
36 | ''; | ||
37 | }; | ||
38 | in stdenv.lib.overrideDerivation pkg (drv: { | ||
39 | postUnpack = '' | ||
40 | ( | ||
41 | cd bar-*/static | ||
42 | rm -rf jquery.js webshim | ||
43 | ln -vs ${jquery}/js/jquery.js . | ||
44 | ln -vs ${webshim}/js webshim | ||
45 | ) | ||
46 | ''; | ||
47 | }) | ||
diff --git a/bragi/bar/generated.nix b/bragi/bar/generated.nix deleted file mode 100644 index 966924ad..00000000 --- a/bragi/bar/generated.nix +++ /dev/null | |||
@@ -1,35 +0,0 @@ | |||
1 | { mkDerivation, aeson, base, bytestring, case-insensitive | ||
2 | , classy-prelude, classy-prelude-conduit, classy-prelude-yesod | ||
3 | , conduit, containers, data-default, directory, fast-logger | ||
4 | , fetchgit, file-embed, hashids, hjsmin, http-conduit, lens | ||
5 | , monad-control, monad-logger, mtl, persistent | ||
6 | , persistent-postgresql, persistent-template, safe, shakespeare | ||
7 | , stdenv, systemd, template-haskell, text, thermoprint-client, time | ||
8 | , unordered-containers, vector, wai, wai-extra, wai-logger, warp | ||
9 | , yaml, yesod, yesod-auth, yesod-core, yesod-form, yesod-static | ||
10 | }: | ||
11 | mkDerivation { | ||
12 | pname = "bar"; | ||
13 | version = "0.6.6"; | ||
14 | src = fetchgit { | ||
15 | url = "git://git.yggdrasil.li/gkleen/pub/bar"; | ||
16 | sha256 = "1nhvmqnsfcj2afbxsqgvdrq97rq7xls7w9w280dg6vyba8gipiwp"; | ||
17 | rev = "76fe2bc3bf14fb3f4cbd892e680f61183ff6db83"; | ||
18 | }; | ||
19 | isLibrary = true; | ||
20 | isExecutable = true; | ||
21 | libraryHaskellDepends = [ | ||
22 | aeson base bytestring case-insensitive classy-prelude | ||
23 | classy-prelude-conduit classy-prelude-yesod conduit containers | ||
24 | data-default directory fast-logger file-embed hashids hjsmin | ||
25 | http-conduit lens monad-control monad-logger mtl persistent | ||
26 | persistent-postgresql persistent-template safe shakespeare systemd | ||
27 | template-haskell text thermoprint-client time unordered-containers | ||
28 | vector wai wai-extra wai-logger warp yaml yesod yesod-auth | ||
29 | yesod-core yesod-form yesod-static | ||
30 | ]; | ||
31 | executableHaskellDepends = [ base ]; | ||
32 | doHaddock = false; | ||
33 | license = stdenv.lib.licenses.unfree; | ||
34 | hydraPlatforms = stdenv.lib.platforms.none; | ||
35 | } | ||
diff --git a/bragi/bar/generated.nix.gup b/bragi/bar/generated.nix.gup deleted file mode 100644 index eeb13ad2..00000000 --- a/bragi/bar/generated.nix.gup +++ /dev/null | |||
@@ -1,5 +0,0 @@ | |||
1 | #!/usr/bin/env zsh | ||
2 | |||
3 | gup -u ${2:r}.cabal | ||
4 | cd ${2:h} | ||
5 | cabal2nix --no-haddock "git://git.yggdrasil.li/gkleen/pub/bar" >! ${1} | ||