From 76a0579933da3ed3ea6a39731a8c50e592c3d7e4 Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Sat, 13 Jun 2015 15:42:24 +0200 Subject: Changed back to symbolic links --- custom/beuteltier.nix | 31 +------------------------------ custom/opossum-wrapper.nix | 21 +-------------------- custom/opossum.nix | 31 +------------------------------ custom/trivmix.nix | 27 +-------------------------- custom/wombat.nix | 30 +----------------------------- 5 files changed, 5 insertions(+), 135 deletions(-) mode change 100644 => 120000 custom/beuteltier.nix mode change 100644 => 120000 custom/opossum-wrapper.nix mode change 100644 => 120000 custom/opossum.nix mode change 100644 => 120000 custom/trivmix.nix mode change 100644 => 120000 custom/wombat.nix (limited to 'custom') diff --git a/custom/beuteltier.nix b/custom/beuteltier.nix deleted file mode 100644 index 6b47b31d..00000000 --- a/custom/beuteltier.nix +++ /dev/null @@ -1,30 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ 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/beuteltier.nix b/custom/beuteltier.nix new file mode 120000 index 00000000..8320fd02 --- /dev/null +++ b/custom/beuteltier.nix @@ -0,0 +1 @@ +../beuteltier/beuteltier.nix \ No newline at end of file diff --git a/custom/opossum-wrapper.nix b/custom/opossum-wrapper.nix deleted file mode 100644 index 2a2a1bff..00000000 --- a/custom/opossum-wrapper.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ stdenv -, 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-wrapper.nix b/custom/opossum-wrapper.nix new file mode 120000 index 00000000..fe258bb6 --- /dev/null +++ b/custom/opossum-wrapper.nix @@ -0,0 +1 @@ +../opossum/wrapper.nix \ No newline at end of file diff --git a/custom/opossum.nix b/custom/opossum.nix deleted file mode 100644 index ea550a8a..00000000 --- a/custom/opossum.nix +++ /dev/null @@ -1,30 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ 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/opossum.nix b/custom/opossum.nix new file mode 120000 index 00000000..b48ef343 --- /dev/null +++ b/custom/opossum.nix @@ -0,0 +1 @@ +../opossum/opossum.nix \ No newline at end of file diff --git a/custom/trivmix.nix b/custom/trivmix.nix deleted file mode 100644 index a5ccb9bf..00000000 --- a/custom/trivmix.nix +++ /dev/null @@ -1,26 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ 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/trivmix.nix b/custom/trivmix.nix new file mode 120000 index 00000000..c968101a --- /dev/null +++ b/custom/trivmix.nix @@ -0,0 +1 @@ +../trivmix/trivmix.nix \ No newline at end of file diff --git a/custom/wombat.nix b/custom/wombat.nix deleted file mode 100644 index 05507fb2..00000000 --- a/custom/wombat.nix +++ /dev/null @@ -1,29 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ 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/wombat.nix b/custom/wombat.nix new file mode 120000 index 00000000..b901a2d9 --- /dev/null +++ b/custom/wombat.nix @@ -0,0 +1 @@ +../wombat/wombat.nix \ No newline at end of file -- cgit v1.2.3