diff options
author | lassulus <lassulus@lassul.us> | 2018-12-30 01:00:52 +0100 |
---|---|---|
committer | lassulus <lassulus@lassul.us> | 2018-12-30 01:00:52 +0100 |
commit | dbba94d6c63ca634e3277e79070c5dced891f84a (patch) | |
tree | 74f5bc9567def4305f98651f9271905485924993 | |
parent | 8de900112e0c8d5671bdfd41207e4cb8c393e8ca (diff) |
shell.nix: use up2date nix-writers
-rw-r--r-- | shell.nix | 15 |
1 files changed, 5 insertions, 10 deletions
@@ -1,13 +1,8 @@ let opkgs = import <nixpkgs> {}; - stockholm = opkgs.fetchgit { - url = "https://cgit.lassul.us/stockholm"; - rev = "02f67ee"; - sha256 = "1ml6aw8ds1sw6bl238v9vc78sjv3iys71184ayirmj2kn6dr33ap"; - fetchSubmodules = true; - }; - lib = import "${stockholm}/lib"; - pkgs = import (builtins.fetchGit { url = "https://github.com/nixos/nixpkgs-channels"; ref = "ae002fe44e96b868c62581e8066d559ca2179e01"; }) { overlays = [(import "${stockholm}/krebs/5pkgs")]; }; + nixWriters = builtins.fetchGit { url = "https://github.com/krebs/nix-writers"; rev = "f6b2139310546574942a1319cadab973b616d888"; }; + pkgs = import (builtins.fetchGit { url = "https://github.com/nixos/nixpkgs-channels"; ref = "ae002fe44e96b868c62581e8066d559ca2179e01"; }) { overlays = [(import "${nixWriters}/pkgs")]; }; + lib = pkgs.lib; commands.review = let moveToDir = key: dir: pkgs.writeText "move-with-${key}.lua" '' @@ -166,11 +161,11 @@ let ''; - shell.utilspkg = pkgs.writeOut "shell.utilspkg" (lib.mapAttrs' (name: link: + shell.utilspkg = pkgs.write "shell.utilspkg" (lib.mapAttrs' (name: link: lib.nameValuePair "/bin/${name}" { inherit link; } ) utils); - shell.cmdspkg = pkgs.writeOut "shell.cmdspkg" (lib.mapAttrs' (name: link: + shell.cmdspkg = pkgs.write "shell.cmdspkg" (lib.mapAttrs' (name: link: lib.nameValuePair "/bin/${name}" { inherit link; } ) commands); |