summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitmodules9
m---------beuteltier0
-rw-r--r--custom/beuteltier.nix30
-rw-r--r--custom/opossum-wrapper.nix20
-rw-r--r--custom/opossum.nix30
-rw-r--r--custom/wombat.nix29
m---------opossum0
-rw-r--r--users/gkleen@bragi.nix18
m---------wombat0
9 files changed, 134 insertions, 2 deletions
diff --git a/.gitmodules b/.gitmodules
index 617dad33..ecc16ee7 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,12 @@
1[submodule "trivmix"] 1[submodule "trivmix"]
2 path = trivmix 2 path = trivmix
3 url = git://git.yggdrasil.li/trivmix 3 url = git://git.yggdrasil.li/trivmix
4[submodule "beuteltier"]
5 path = beuteltier
6 url = git://git.yggdrasil.li/beuteltier
7[submodule "opossum"]
8 path = opossum
9 url = git://git.yggdrasil.li/opossum
10[submodule "wombat"]
11 path = wombat
12 url = git://git.yggdrasil.li/wombat
diff --git a/beuteltier b/beuteltier
new file mode 160000
Subproject c2bf68491c6e76c3eeed135ceb1087606a5f170
diff --git a/custom/beuteltier.nix b/custom/beuteltier.nix
new file mode 100644
index 00000000..0df82948
--- /dev/null
+++ b/custom/beuteltier.nix
@@ -0,0 +1,30 @@
1# This file was auto-generated by cabal2nix. Please do NOT edit manually!
2
3{ cabal, aeson, dataDefault, filepath, lenses, mtl, tar, text
4, transformers, yaml, zlib, cryptohash, time, base16Bytestring
5, attoparsecExpr, caseInsensitive, timeparsers
6, fetchgit
7}:
8
9cabal.mkDerivation (self: {
10 pname = "beuteltier";
11 version = "5.1.3";
12 #src = ./.;
13 src = fetchgit {
14 url = git://git.yggdrasil.li/beuteltier;
15 # nix-shell -p nix-prefetch-scripts --command 'nix-prefetch-git git://git.yggdrasil.li/beuteltier' 2>&1 | grep -E '(git revision|hash) is ' | sed -r 's/git revision is /rev = "/' | sed -r 's/hash is /sha256 = "/' | sed -r 's/$/";/'
16 rev = "8c7be69fa083176f7566cce7c6e2993b7a47b6aa";
17 sha256 = "964d33d7e8a170f1a9aa9e48caceb633ce4f748ea747d73069641775b6988d7a";
18 };
19 buildDepends = [
20 aeson dataDefault filepath lenses mtl tar text transformers yaml
21 zlib cryptohash time base16Bytestring attoparsecExpr caseInsensitive
22 timeparsers
23 ];
24 meta = {
25 homepage = "git://git.yggdrasil.li/beuteltier";
26 description = "Accessor library for \"Beutel\" (Bag) - a backstore (directory) containing tracked objects (.tgz files with a yaml manifest inside)";
27 license = self.stdenv.lib.licenses.publicDomain;
28 platforms = self.ghc.meta.platforms;
29 };
30})
diff --git a/custom/opossum-wrapper.nix b/custom/opossum-wrapper.nix
new file mode 100644
index 00000000..2a2a1bff
--- /dev/null
+++ b/custom/opossum-wrapper.nix
@@ -0,0 +1,20 @@
1{ stdenv
2, ghcWithPackages
3, makeWrapper
4, opossum
5, additionalPackages ? (p: [])
6}:
7
8let
9 myEnv = ghcWithPackages (p: with p; [ beuteltier opossum ] ++ additionalPackages p);
10in stdenv.mkDerivation {
11 name = "opossum-wrapper";
12
13 nativeBuildInputs = [ makeWrapper ];
14
15 buildCommand = ''
16 mkdir -p $out/bin
17 makeWrapper ${opossum}/bin/opossum $out/bin/opossum \
18 --set NIX_GHC ${myEnv}/bin/ghc
19 '';
20}
diff --git a/custom/opossum.nix b/custom/opossum.nix
new file mode 100644
index 00000000..e55086c2
--- /dev/null
+++ b/custom/opossum.nix
@@ -0,0 +1,30 @@
1# This file was auto-generated by cabal2nix. Please do NOT edit manually!
2
3{ cabal, beuteltier, dataDefault, dyre, exceptions, feed, filepath
4, httpClient, httpClientTls, lenses, mtl, shellMonad, tagged, text
5, time, transformers, hxt, caseInsensitive, attoparsec
6, fetchgit
7}:
8
9cabal.mkDerivation (self: {
10 pname = "opossum";
11 version = "1.1.0";
12 src = fetchgit {
13 url = git://git.yggdrasil.li/opossum;
14 # nix-shell -p nix-prefetch-scripts --command 'nix-prefetch-git git://git.yggdrasil.li/opossum' 2>&1 | grep -E '(git revision|hash) is ' | sed -r 's/git revision is /rev = "/' | sed -r 's/hash is /sha256 = "/' | sed -r 's/$/";/'
15 rev = "47aaa1d9e622c12a6f911454e111e8228c9f592c";
16 sha256 = "18fe08a902778bf70c88954fcf659ae196da7a1ee7841344624b15bf30ad3910";
17 };
18 isLibrary = true;
19 isExecutable = true;
20 buildDepends = [
21 beuteltier dataDefault dyre exceptions feed filepath httpClient
22 httpClientTls lenses mtl shellMonad tagged text time transformers
23 hxt caseInsensitive attoparsec
24 ];
25 meta = {
26 description = "A webscraper for beuteltier";
27 license = self.stdenv.lib.licenses.publicDomain;
28 platforms = self.ghc.meta.platforms;
29 };
30})
diff --git a/custom/wombat.nix b/custom/wombat.nix
new file mode 100644
index 00000000..baeac700
--- /dev/null
+++ b/custom/wombat.nix
@@ -0,0 +1,29 @@
1# This file was auto-generated by cabal2nix. Please do NOT edit manually!
2
3{ cabal, aeson, beuteltier, filepath, lenses, mtl
4, optparseApplicative, text, time, transformers
5, unorderedContainers, vector
6, fetchgit
7}:
8
9cabal.mkDerivation (self: {
10 pname = "wombat";
11 version = "0.4.0";
12 src = fetchgit {
13 url = git://git.yggdrasil.li/wombat;
14 # nix-shell -p nix-prefetch-scripts --command 'nix-prefetch-git git://git.yggdrasil.li/wombat' 2>&1 | grep -E '(git revision|hash) is ' | sed -r 's/git revision is /rev = "/' | sed -r 's/hash is /sha256 = "/' | sed -r 's/$/";/'
15 rev = "8f1b1ed05d12a0f5f47a7834d4878d2a3e8014d3";
16 sha256 = "f441971623f3f2a35df9feae0ac927b5447d62fede33fd67bb54baeb08468a51";
17 };
18 isLibrary = false;
19 isExecutable = true;
20 buildDepends = [
21 aeson beuteltier filepath lenses mtl optparseApplicative text time
22 transformers unorderedContainers vector
23 ];
24 meta = {
25 description = "A Beuteltier";
26 license = self.stdenv.lib.licenses.publicDomain;
27 platforms = self.ghc.meta.platforms;
28 };
29})
diff --git a/opossum b/opossum
new file mode 160000
Subproject 49eec05199878161d59ef294c96bf7561efc842
diff --git a/users/gkleen@bragi.nix b/users/gkleen@bragi.nix
index 326280f3..57786450 100644
--- a/users/gkleen@bragi.nix
+++ b/users/gkleen@bragi.nix
@@ -3,7 +3,7 @@
3 mpv = let mpv = pkgs.mpv.override { youtubeSupport = true; theoraSupport = true; }; in pkgs.stdenv.mkDerivation { 3 mpv = let mpv = pkgs.mpv.override { youtubeSupport = true; theoraSupport = true; }; in pkgs.stdenv.mkDerivation {
4 name = "mpv-wrapper"; 4 name = "mpv-wrapper";
5 src = mpv; 5 src = mpv;
6 unpackPhase = "cat"; 6 unpackPhase = "true";
7 buildInputs = [ pkgs.makeWrapper pkgs.rsync ]; 7 buildInputs = [ pkgs.makeWrapper pkgs.rsync ];
8 installPhase = '' 8 installPhase = ''
9 mkdir -p $out 9 mkdir -p $out
@@ -17,7 +17,7 @@
17 jackmeter = let jackmeter = pkgs.jackmeter.override {}; in pkgs.stdenv.mkDerivation { 17 jackmeter = let jackmeter = pkgs.jackmeter.override {}; in pkgs.stdenv.mkDerivation {
18 name = "jackmeter-wrapper"; 18 name = "jackmeter-wrapper";
19 src = jackmeter; 19 src = jackmeter;
20 unpackPhase = "cat"; 20 unpackPhase = "true";
21 buildInputs = [ pkgs.makeWrapper pkgs.rsync ]; 21 buildInputs = [ pkgs.makeWrapper pkgs.rsync ];
22 installPhase = '' 22 installPhase = ''
23 mkdir -p $out 23 mkdir -p $out
@@ -28,5 +28,19 @@
28 --run "umask 0" 28 --run "umask 0"
29 ''; 29 '';
30 }; 30 };
31 myHaskellPackages = pkgs.recurseIntoAttrs {
32 pkgs.haskellPackages.override {
33 extension = self: super: let
34 callPackage = pkgs.lib.callPackageWith self;
35 in
36 beuteltier = callPackage custom/beuteltier.nix { fetchgit = pkgs.fetchgit; };
37 wombat = callPackage custom/wombat.nix { fetchgit = pkgs.fetchgit; };
38 opossum = callPackage custom/opossum.nix { fetchgit = pkgs.fetchgit; };
39 opossumWrapper = callPackage custom/opossum-wrapper.nix {
40 stdenv = pkgs.stdenv;
41 makeWrapper = pkgs.stdenv.makeWrapper;
42 };
43 };
44 };
31 }; 45 };
32} 46}
diff --git a/wombat b/wombat
new file mode 160000
Subproject f9689918eb8304591f4b29975868eca19f8bde1