From c88ee737b8c44162c640a4c865336c5a843029ea Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gkleen@yggdrasil.li>
Date: Sat, 8 Sep 2018 14:37:34 +0200
Subject: Simplify bragi, move bar to odin

---
 bragi/bar/default.nix       | 47 ---------------------------------------------
 bragi/bar/generated.nix     | 35 ---------------------------------
 bragi/bar/generated.nix.gup |  5 -----
 3 files changed, 87 deletions(-)
 delete mode 100644 bragi/bar/default.nix
 delete mode 100644 bragi/bar/generated.nix
 delete mode 100644 bragi/bar/generated.nix.gup

(limited to 'bragi')

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 @@
-{ haskellPackages
-, stdenv
-, fetchFromGitHub
-, fetchurl
-, haskell
-}:
-
-let
-  pkg = haskellPackages.callPackage ./generated.nix {};
-  webshim = stdenv.mkDerivation rec {
-    name = "webshim-${version}";
-    version = "1.16.0";
-    src = fetchFromGitHub {
-      owner = "aFarkas";
-      repo = "webshim";
-      rev = "1.16.0";
-      sha256 = "14pk7hljqipzp0n7vpgcfxr3w4bla57cwyd7bmwmmxrm2zn62cyh";
-    };
-
-    installPhase = ''
-      mkdir -p $out/js
-      cp -r $src/js-webshim/dev/* $out/js/
-    '';
-  };
-  jquery = stdenv.mkDerivation rec {
-    name = "jquery-${version}";
-    version = "3.3.1";
-    src = fetchurl {
-      url = "https://github.com/jquery/jquery/archive/${version}.tar.gz";
-      sha256 = "1d1pilrwiz0yjx27cd7gbn8qar6hw5zgwjhpsyaijcg52z82wi5q";
-    };
-
-    installPhase = ''
-      mkdir -p $out/js
-      cp -r dist/jquery.js $out/js/
-    '';
-  };
-in stdenv.lib.overrideDerivation pkg (drv: {
-  postUnpack = ''
-    (
-      cd bar-*/static
-      rm -rf jquery.js webshim
-      ln -vs ${jquery}/js/jquery.js .
-      ln -vs ${webshim}/js webshim
-    )
-  '';
-})
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 @@
-{ mkDerivation, aeson, base, bytestring, case-insensitive
-, classy-prelude, classy-prelude-conduit, classy-prelude-yesod
-, conduit, containers, data-default, directory, fast-logger
-, fetchgit, file-embed, hashids, hjsmin, http-conduit, lens
-, monad-control, monad-logger, mtl, persistent
-, persistent-postgresql, persistent-template, safe, shakespeare
-, stdenv, systemd, template-haskell, text, thermoprint-client, time
-, unordered-containers, vector, wai, wai-extra, wai-logger, warp
-, yaml, yesod, yesod-auth, yesod-core, yesod-form, yesod-static
-}:
-mkDerivation {
-  pname = "bar";
-  version = "0.6.6";
-  src = fetchgit {
-    url = "git://git.yggdrasil.li/gkleen/pub/bar";
-    sha256 = "1nhvmqnsfcj2afbxsqgvdrq97rq7xls7w9w280dg6vyba8gipiwp";
-    rev = "76fe2bc3bf14fb3f4cbd892e680f61183ff6db83";
-  };
-  isLibrary = true;
-  isExecutable = true;
-  libraryHaskellDepends = [
-    aeson base bytestring case-insensitive classy-prelude
-    classy-prelude-conduit classy-prelude-yesod conduit containers
-    data-default directory fast-logger file-embed hashids hjsmin
-    http-conduit lens monad-control monad-logger mtl persistent
-    persistent-postgresql persistent-template safe shakespeare systemd
-    template-haskell text thermoprint-client time unordered-containers
-    vector wai wai-extra wai-logger warp yaml yesod yesod-auth
-    yesod-core yesod-form yesod-static
-  ];
-  executableHaskellDepends = [ base ];
-  doHaddock = false;
-  license = stdenv.lib.licenses.unfree;
-  hydraPlatforms = stdenv.lib.platforms.none;
-}
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 @@
-#!/usr/bin/env zsh
-
-gup -u ${2:r}.cabal
-cd ${2:h}
-cabal2nix --no-haddock "git://git.yggdrasil.li/gkleen/pub/bar" >! ${1}
-- 
cgit v1.2.3