5 files changed, 5 insertions, 135 deletions
diff --git a/custom/beuteltier.nix b/custom/beuteltier.nix
index 6b47b31d..8320fd02 100644..120000
--- a/custom/beuteltier.nix
+++ b/custom/beuteltier.nix
@@ -1,30 +1 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+../beuteltier/beuteltier.nix
+\ No newline at end of file
-{ cabal, aeson, dataDefault, filepath, lenses, mtl, tar, text
-, transformers, yaml, zlib, cryptohash, time, base16Bytestring
-, attoparsecExpr, caseInsensitive, timeparsers
-, fetchgit
-}:
-cabal.mkDerivation (self: {
-  pname = "beuteltier";
-  version = "6.0.1";
-  #src = ./.;
-  src = fetchgit {
-    url = git://git.yggdrasil.li/beuteltier;
-    # 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/$/";/'
-    rev = "f4c0bc02bbb8ed61b383b4c7dd7fc7a1d4e7c85e";
-    sha256 = "795a137c7972ef5da3c662bfbd59550573cb283fae83527efa9a99a66d7b4c98";
-  };
-  buildDepends = [
-    aeson dataDefault filepath lenses mtl tar text transformers yaml
-    zlib cryptohash time base16Bytestring attoparsecExpr caseInsensitive
-    timeparsers
-  ];
-  meta = {
-    homepage = "git://git.yggdrasil.li/beuteltier";
-    description = "Accessor library for \"Beutel\" (Bag) - a backstore (directory) containing tracked objects (.tgz files with a yaml manifest inside)";
-    license = self.stdenv.lib.licenses.publicDomain;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/custom/opossum-wrapper.nix b/custom/opossum-wrapper.nix
index 2a2a1bff..fe258bb6 100644..120000
--- a/custom/opossum-wrapper.nix
+++ b/custom/opossum-wrapper.nix
@@ -1,20 +1 @@
-{ stdenv
+../opossum/wrapper.nix
+\ No newline at end of file
-, ghcWithPackages
-, makeWrapper
-, opossum
-, additionalPackages ? (p: [])
-}:
-let
-  myEnv = ghcWithPackages (p: with p; [ beuteltier opossum ] ++ additionalPackages p);
-in stdenv.mkDerivation {
-  name = "opossum-wrapper";
-  nativeBuildInputs = [ makeWrapper ];
-  buildCommand = ''
-    mkdir -p $out/bin
-    makeWrapper ${opossum}/bin/opossum $out/bin/opossum \
-      --set NIX_GHC ${myEnv}/bin/ghc
-  '';
-}
diff --git a/custom/opossum.nix b/custom/opossum.nix
index ea550a8a..b48ef343 100644..120000
--- a/custom/opossum.nix
+++ b/custom/opossum.nix
@@ -1,30 +1 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+../opossum/opossum.nix
+\ No newline at end of file
-{ cabal, beuteltier, dataDefault, dyre, exceptions, feed, filepath
-, httpClient, httpClientTls, lenses, mtl, shellMonad, tagged, text
-, time, transformers, hxt, caseInsensitive, attoparsec
-, fetchgit
-}:
-cabal.mkDerivation (self: {
-  pname = "opossum";
-  version = "1.4.1";
-  src = fetchgit {
-    url = git://git.yggdrasil.li/opossum;
-    # 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/$/";/'
-    rev = "f5d384df2a6dff3a7402e51ee5aff58bd6792e6a";
-    sha256 = "8b6e1d6878dce58bfc7cb0c9414a69109c622aae16d4515cf22d72825ae3da5f";
-  };
-  isLibrary = true;
-  isExecutable = true;
-  buildDepends = [
-    beuteltier dataDefault dyre exceptions feed filepath httpClient
-    httpClientTls lenses mtl shellMonad tagged text time transformers
-    hxt caseInsensitive attoparsec
-  ];
-  meta = {
-    description = "A webscraper for beuteltier";
-    license = self.stdenv.lib.licenses.publicDomain;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/custom/trivmix.nix b/custom/trivmix.nix
index a5ccb9bf..c968101a 100644..120000
--- a/custom/trivmix.nix
+++ b/custom/trivmix.nix
@@ -1,26 +1 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+../trivmix/trivmix.nix
+\ No newline at end of file
-{ cabal, filepath, hinotify, jack, optparseApplicative
-, transformers, explicitException, process, caseInsensitive
-, fetchgit
-}:
-cabal.mkDerivation (self: {
-  pname = "trivmix";
-  version = "2.3.0";
-  src = fetchgit {
-    url = git://git.yggdrasil.li/trivmix;
-    rev = "d5189cba07f63c3d2f8c575a31c1734f7c9aeed6";
-    sha256 = "88b215dc2d24b875359835b5a75acdd1d6172ad4d4e3fad9ce4cdc3ffec51ba3";
-  };
-  isLibrary = false;
-  isExecutable = true;
-  buildDepends = [
-    filepath hinotify jack optparseApplicative transformers explicitException process
-    caseInsensitive
-  ];
-  meta = {
-    license = self.stdenv.lib.licenses.publicDomain;
-    platforms = self.ghc.meta.platforms;
-  };
-})
diff --git a/custom/wombat.nix b/custom/wombat.nix
index 05507fb2..b901a2d9 100644..120000
--- a/custom/wombat.nix
+++ b/custom/wombat.nix
@@ -1,29 +1 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
+../wombat/wombat.nix
+\ No newline at end of file
-{ cabal, aeson, beuteltier, filepath, lenses, mtl
-, optparseApplicative, text, time, transformers
-, unorderedContainers, vector
-, fetchgit
-}:
-cabal.mkDerivation (self: {
-  pname = "wombat";
-  version = "0.4.2";
-  src = fetchgit {
-    url = git://git.yggdrasil.li/wombat;
-    # 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/$/";/'
-    rev = "bf5a6e60047791201fddd5f2471012a4dc21b248";
-    sha256 = "4b961f05ab7bdc3399e68bb33994cbb3f57369f411bf7bd0a5f868bc8cc2e844";
-  };
-  isLibrary = false;
-  isExecutable = true;
-  buildDepends = [
-    aeson beuteltier filepath lenses mtl optparseApplicative text time
-    transformers unorderedContainers vector
-  ];
-  meta = {
-    description = "A Beuteltier";
-    license = self.stdenv.lib.licenses.publicDomain;
-    platforms = self.ghc.meta.platforms;
-  };
-})

diff --git a/custom/beuteltier.nix b/custom/beuteltier.nix index 6b47b31d..8320fd02 100644..120000 --- a/custom/beuteltier.nix +++ b/custom/beuteltier.nix
@@ -1,30 +1 @@
1	# This file was auto-generated by cabal2nix. Please do NOT edit manually!	../beuteltier/beuteltier.nix \ No newline at end of file
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
9	cabal.mkDerivation (self: {
10	pname = "beuteltier";
11	version = "6.0.1";
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 = "f4c0bc02bbb8ed61b383b4c7dd7fc7a1d4e7c85e";
17	sha256 = "795a137c7972ef5da3c662bfbd59550573cb283fae83527efa9a99a66d7b4c98";
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 index 2a2a1bff..fe258bb6 100644..120000 --- a/custom/opossum-wrapper.nix +++ b/custom/opossum-wrapper.nix
@@ -1,20 +1 @@
1	{ stdenv	../opossum/wrapper.nix \ No newline at end of file
2	, ghcWithPackages
3	, makeWrapper
4	, opossum
5	, additionalPackages ? (p: [])
6	}:
7
8	let
9	myEnv = ghcWithPackages (p: with p; [ beuteltier opossum ] ++ additionalPackages p);
10	in 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 index ea550a8a..b48ef343 100644..120000 --- a/custom/opossum.nix +++ b/custom/opossum.nix
@@ -1,30 +1 @@
1	# This file was auto-generated by cabal2nix. Please do NOT edit manually!	../opossum/opossum.nix \ No newline at end of file
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
9	cabal.mkDerivation (self: {
10	pname = "opossum";
11	version = "1.4.1";
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 = "f5d384df2a6dff3a7402e51ee5aff58bd6792e6a";
16	sha256 = "8b6e1d6878dce58bfc7cb0c9414a69109c622aae16d4515cf22d72825ae3da5f";
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/trivmix.nix b/custom/trivmix.nix index a5ccb9bf..c968101a 100644..120000 --- a/custom/trivmix.nix +++ b/custom/trivmix.nix
@@ -1,26 +1 @@
1	# This file was auto-generated by cabal2nix. Please do NOT edit manually!	../trivmix/trivmix.nix \ No newline at end of file
2
3	{ cabal, filepath, hinotify, jack, optparseApplicative
4	, transformers, explicitException, process, caseInsensitive
5	, fetchgit
6	}:
7
8	cabal.mkDerivation (self: {
9	pname = "trivmix";
10	version = "2.3.0";
11	src = fetchgit {
12	url = git://git.yggdrasil.li/trivmix;
13	rev = "d5189cba07f63c3d2f8c575a31c1734f7c9aeed6";
14	sha256 = "88b215dc2d24b875359835b5a75acdd1d6172ad4d4e3fad9ce4cdc3ffec51ba3";
15	};
16	isLibrary = false;
17	isExecutable = true;
18	buildDepends = [
19	filepath hinotify jack optparseApplicative transformers explicitException process
20	caseInsensitive
21	];
22	meta = {
23	license = self.stdenv.lib.licenses.publicDomain;
24	platforms = self.ghc.meta.platforms;
25	};
26	})


diff --git a/custom/wombat.nix b/custom/wombat.nix index 05507fb2..b901a2d9 100644..120000 --- a/custom/wombat.nix +++ b/custom/wombat.nix
@@ -1,29 +1 @@
1	# This file was auto-generated by cabal2nix. Please do NOT edit manually!	../wombat/wombat.nix \ No newline at end of file
2
3	{ cabal, aeson, beuteltier, filepath, lenses, mtl
4	, optparseApplicative, text, time, transformers
5	, unorderedContainers, vector
6	, fetchgit
7	}:
8
9	cabal.mkDerivation (self: {
10	pname = "wombat";
11	version = "0.4.2";
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 = "bf5a6e60047791201fddd5f2471012a4dc21b248";
16	sha256 = "4b961f05ab7bdc3399e68bb33994cbb3f57369f411bf7bd0a5f868bc8cc2e844";
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	})