diff options
Diffstat (limited to 'fun')
-rw-r--r-- | fun/amsterdump/default.nix | 6 | ||||
-rw-r--r-- | fun/aoc2019/default.nix | 4 | ||||
-rw-r--r-- | fun/gemma/default.nix | 12 | ||||
-rw-r--r-- | fun/quinistry/default.nix | 4 | ||||
-rw-r--r-- | fun/watchblob/default.nix | 6 | ||||
-rw-r--r-- | fun/wcl/default.nix | 6 |
6 files changed, 19 insertions, 19 deletions
diff --git a/fun/amsterdump/default.nix b/fun/amsterdump/default.nix index e5fc22a176ef..0d98c9a7ab93 100644 --- a/fun/amsterdump/default.nix +++ b/fun/amsterdump/default.nix @@ -1,12 +1,12 @@ -{ pkgs, ... }: +{ depot, ... }: -pkgs.buildGo.program { +depot.nix.buildGo.program { name = "amsterdump"; srcs = [ ./main.go ]; - deps = with pkgs.third_party; map (p: p.gopkg) [ + deps = with depot.third_party; map (p: p.gopkg) [ # gopkgs."golang.org".x.oauth2.google gopkgs."googlemaps.github.io".maps ]; diff --git a/fun/aoc2019/default.nix b/fun/aoc2019/default.nix index a53586eea9eb..5f1f248c504a 100644 --- a/fun/aoc2019/default.nix +++ b/fun/aoc2019/default.nix @@ -1,7 +1,7 @@ # Solutions for Advent of Code 2019, written in Emacs Lisp. # # For each day a new file is created as "solution-day$n.el". -{ pkgs, ... }: +{ depot, ... }: let inherit (builtins) attrNames filter head listToAttrs match readDir; @@ -13,7 +13,7 @@ let solutionFiles = filter (e: dir."${e}" == "regular" && isSolution e) (attrNames dir); solutions = map (f: let day = getDay f; in { name = day; - value = pkgs.writeElispBin { + value = depot.writeElispBin { # TODO(tazjin): move writeElispBin to depot.nix name = "aoc2019"; deps = p: with p; [ dash s ht ]; src = ./. + ("/" + f); diff --git a/fun/gemma/default.nix b/fun/gemma/default.nix index cecf8bb751ee..55612106d2e0 100644 --- a/fun/gemma/default.nix +++ b/fun/gemma/default.nix @@ -1,8 +1,8 @@ -{ pkgs, ... }: +{ depot, ... }: let - inherit (pkgs) elmPackages; - inherit (pkgs.third_party) cacert iana-etc libredirect stdenv runCommandNoCC; + inherit (depot) elmPackages; + inherit (depot.third_party) cacert iana-etc libredirect stdenv runCommandNoCC writeText; frontend = stdenv.mkDerivation { name = "gemma-frontend.html"; @@ -26,17 +26,17 @@ let ''; }; - injectFrontend = pkgs.writeText "gemma-frontend.lisp" '' + injectFrontend = writeText "gemma-frontend.lisp" '' (in-package :gemma) (setq *static-file-location* "${runCommandNoCC "frontend" {} '' mkdir -p $out cp ${frontend} $out/index.html ''}/") ''; -in pkgs.nix.buildLisp.program { +in depot.nix.buildLisp.program { name = "gemma"; - deps = with pkgs.third_party.lisp; [ + deps = with depot.third_party.lisp; [ cl-json cl-prevalence hunchentoot diff --git a/fun/quinistry/default.nix b/fun/quinistry/default.nix index 8b005da8f67e..b12c5e6f0c29 100644 --- a/fun/quinistry/default.nix +++ b/fun/quinistry/default.nix @@ -1,6 +1,6 @@ -{ pkgs, ... }: +{ depot, ... }: -pkgs.buildGo.program { +depot.nix.buildGo.program { name = "quinistry"; srcs = [ ./const.go diff --git a/fun/watchblob/default.nix b/fun/watchblob/default.nix index 51f14ab16381..dc32e4d1cefb 100644 --- a/fun/watchblob/default.nix +++ b/fun/watchblob/default.nix @@ -1,13 +1,13 @@ -{ pkgs, ... }: +{ depot, ... }: -pkgs.buildGo.program { +depot.nix.buildGo.program { name = "watchblob"; srcs = [ ./main.go ./urls.go ]; - deps = with pkgs.third_party; [ + deps = with depot.third_party; [ gopkgs."golang.org".x.crypto.ssh.terminal.gopkg ]; } diff --git a/fun/wcl/default.nix b/fun/wcl/default.nix index ca1cbb80589a..e4d9804c807c 100644 --- a/fun/wcl/default.nix +++ b/fun/wcl/default.nix @@ -1,13 +1,13 @@ -{ pkgs, ... }: +{ depot, ... }: -pkgs.nix.buildLisp.program { +depot.nix.buildLisp.program { name = "wc"; srcs = [ ./wc.lisp ]; - deps = with pkgs.third_party.lisp; [ + deps = with depot.third_party.lisp; [ unix-opts iterate ]; |