From 99527e88aec089b4fea496248cf03f738bfed257 Mon Sep 17 00:00:00 2001 From: tv Date: Fri, 24 Jul 2015 23:24:46 +0200 Subject: Zpkgs {tv -> krebs} dic --- Zpkgs/krebs/default.nix | 1 + Zpkgs/krebs/dic.nix | 36 ++++++++++++++++++++++++++++++++++++ Zpkgs/tv/default.nix | 1 - Zpkgs/tv/dic.nix | 36 ------------------------------------ 4 files changed, 37 insertions(+), 37 deletions(-) create mode 100644 Zpkgs/krebs/dic.nix delete mode 100644 Zpkgs/tv/dic.nix diff --git a/Zpkgs/krebs/default.nix b/Zpkgs/krebs/default.nix index e07b96b56..231fda797 100644 --- a/Zpkgs/krebs/default.nix +++ b/Zpkgs/krebs/default.nix @@ -6,6 +6,7 @@ in pkgs // { + dic = callPackage ./dic.nix {}; genid = callPackage ./genid.nix {}; github-hosts-sync = callPackage ./github-hosts-sync.nix {}; github-known_hosts = callPackage ./github-known_hosts.nix {}; diff --git a/Zpkgs/krebs/dic.nix b/Zpkgs/krebs/dic.nix new file mode 100644 index 000000000..571773d22 --- /dev/null +++ b/Zpkgs/krebs/dic.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchgit, coreutils, curl, gnused, gnugrep, ... }: + +stdenv.mkDerivation { + name = "dic"; + + src = fetchgit { + url = https://github.com/krebscode/painload; + rev = "35ccac73d563ad30d2851b9aeed4cfef69ff74e3"; + sha256 = "1y1fs2p3xj2yrqpw0h5kd0f3c5p1y70xk1hjnw99sr33r67s9c35"; + }; + + phases = [ + "unpackPhase" + "installPhase" + ]; + + installPhase = + let + path = stdenv.lib.makeSearchPath "bin" [ + coreutils + curl + gnused + gnugrep + ]; + in + '' + mkdir -p $out/bin + + sed \ + 's,^main() {$,&\n PATH=${path}; export PATH,' \ + < ./util/bin/dic \ + > $out/bin/dic + + chmod +x $out/bin/dic + ''; +} diff --git a/Zpkgs/tv/default.nix b/Zpkgs/tv/default.nix index a8ca2b2ab..50625f868 100644 --- a/Zpkgs/tv/default.nix +++ b/Zpkgs/tv/default.nix @@ -7,7 +7,6 @@ in krebs // { charybdis = callPackage ./charybdis {}; - dic = callPackage ./dic.nix {}; lentil = callPackage ./lentil {}; much = callPackage ./much.nix {}; viljetic-pages = callPackage ./viljetic-pages {}; diff --git a/Zpkgs/tv/dic.nix b/Zpkgs/tv/dic.nix deleted file mode 100644 index 571773d22..000000000 --- a/Zpkgs/tv/dic.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ stdenv, fetchgit, coreutils, curl, gnused, gnugrep, ... }: - -stdenv.mkDerivation { - name = "dic"; - - src = fetchgit { - url = https://github.com/krebscode/painload; - rev = "35ccac73d563ad30d2851b9aeed4cfef69ff74e3"; - sha256 = "1y1fs2p3xj2yrqpw0h5kd0f3c5p1y70xk1hjnw99sr33r67s9c35"; - }; - - phases = [ - "unpackPhase" - "installPhase" - ]; - - installPhase = - let - path = stdenv.lib.makeSearchPath "bin" [ - coreutils - curl - gnused - gnugrep - ]; - in - '' - mkdir -p $out/bin - - sed \ - 's,^main() {$,&\n PATH=${path}; export PATH,' \ - < ./util/bin/dic \ - > $out/bin/dic - - chmod +x $out/bin/dic - ''; -} -- cgit v1.2.3 [cgit] Unable to lock slot /tmp/cgit/59200000.lock: No such file or directory (2)