diff options
Diffstat (limited to 'pkgs/applications')
-rw-r--r-- | pkgs/applications/science/biology/mosdepth/default.nix | 30 | ||||
-rw-r--r-- | pkgs/applications/terminal-emulators/nimmm/default.nix | 40 |
2 files changed, 9 insertions, 61 deletions
diff --git a/pkgs/applications/science/biology/mosdepth/default.nix b/pkgs/applications/science/biology/mosdepth/default.nix index 715f2ea313b4..b6cc5e406153 100644 --- a/pkgs/applications/science/biology/mosdepth/default.nix +++ b/pkgs/applications/science/biology/mosdepth/default.nix @@ -1,23 +1,9 @@ -{lib, stdenv, fetchFromGitHub, nim, htslib, pcre}: +{lib, nimPackages, fetchFromGitHub, pcre}: -let - hts-nim = fetchFromGitHub { - owner = "brentp"; - repo = "hts-nim"; - rev = "v0.3.4"; - sha256 = "0670phk1bq3l9j2zaa8i5wcpc5dyfrc0l2a6c21g0l2mmdczffa7"; - }; - - docopt = fetchFromGitHub { - owner = "docopt"; - repo = "docopt.nim"; - rev = "v0.6.7"; - sha256 = "1ga7ckg21fzwwvh26jp2phn2h3pvkn8g8sm13dxif33rp471bv37"; - }; - -in stdenv.mkDerivation rec { +nimPackages.buildNimPackage rec { pname = "mosdepth"; version = "0.3.2"; + nimBinOnly = true; src = fetchFromGitHub { owner = "brentp"; @@ -26,15 +12,7 @@ in stdenv.mkDerivation rec { sha256 = "sha256-uui4yC7ok+pvbXVKfBVsAarH40fnH4fnP8P4uzOqztQ="; }; - nativeBuildInputs = [ nim ]; - buildInputs = [ htslib pcre ]; - - buildPhase = '' - HOME=$TMPDIR - nim -p:${hts-nim}/src -p:${docopt}/src c --nilseqs:on -d:release mosdepth.nim - ''; - - installPhase = "install -Dt $out/bin mosdepth"; + buildInputs = with nimPackages; [ docopt hts-nim pcre ]; meta = with lib; { description = "fast BAM/CRAM depth calculation for WGS, exome, or targeted sequencing"; diff --git a/pkgs/applications/terminal-emulators/nimmm/default.nix b/pkgs/applications/terminal-emulators/nimmm/default.nix index bb09fa776b62..0e0d75ab8012 100644 --- a/pkgs/applications/terminal-emulators/nimmm/default.nix +++ b/pkgs/applications/terminal-emulators/nimmm/default.nix @@ -1,30 +1,9 @@ -{ lib, stdenv, fetchFromGitHub, nim, termbox, pcre }: +{ lib, nimPackages, fetchFromGitHub, nim, termbox, pcre }: -let - noise = fetchFromGitHub { - owner = "jangko"; - repo = "nim-noise"; - rev = "v0.1.14"; - sha256 = "0wndiphznfyb1pac6zysi3bqljwlfwj6ziarcwnpf00sw2zni449"; - }; - - nimbox = fetchFromGitHub { - owner = "dom96"; - repo = "nimbox"; - rev = "6a56e76c01481176f16ae29b7d7c526bd83f229b"; - sha256 = "15x1sdfxa1xcqnr68705jfnlv83lm0xnp2z9iz3pgc4bz5vwn4x1"; - }; - - lscolors = fetchFromGitHub { - owner = "joachimschmidt557"; - repo = "nim-lscolors"; - rev = "v0.3.3"; - sha256 = "0526hqh46lcfsvymb67ldsc8xbfn24vicn3b8wrqnh6mag8wynf4"; - }; - -in stdenv.mkDerivation rec { +nimPackages.buildNimPackage rec { pname = "nimmm"; version = "0.2.0"; + nimBinOnly = true; src = fetchFromGitHub { owner = "joachimschmidt557"; @@ -33,17 +12,8 @@ in stdenv.mkDerivation rec { sha256 = "168n61avphbxsxfq8qzcnlqx6wgvz5yrjvs14g25cg3k46hj4xqg"; }; - nativeBuildInputs = [ nim ]; - buildInputs = [ termbox pcre ]; - - buildPhase = '' - export HOME=$TMPDIR; - nim -p:${noise} -p:${nimbox} -p:${lscolors}/src c -d:release src/nimmm.nim - ''; - - installPhase = '' - install -Dt $out/bin src/nimmm - ''; + buildInputs = [ termbox pcre ] + ++ (with nimPackages; [ noise nimbox lscolors ]); meta = with lib; { description = "Terminal file manager written in nim"; |