diff options
| author | tv <tv@krebsco.de> | 2018-09-16 10:10:37 +0200 | 
|---|---|---|
| committer | tv <tv@krebsco.de> | 2018-09-16 10:10:37 +0200 | 
| commit | 5ae2b7f3691364ba17cdb01fde98c2722d3a707e (patch) | |
| tree | a89625a4c7d405f7918c064cee6287df63fa3b4f | |
| parent | a690f0aeca7eb53c9757933607f3d3fdb64c7012 (diff) | |
pkgs: add nix-writers 3.0.0 to overlaysv1.4.1palo/master
| -rw-r--r-- | pkgs/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/overlay.nix | 10 | 
2 files changed, 8 insertions, 10 deletions
| diff --git a/pkgs/default.nix b/pkgs/default.nix index 639ed13..b8530a8 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -1,7 +1,15 @@  { overlays ? [], ... }@args: +let +  nix-writers = builtins.fetchGit { +    url = https://cgit.krebsco.de/nix-writers/; +    rev = "c27a9416e8ee04d708b11b48f8cf1a055c0cc079"; +  }; +in +  import <nixpkgs> (args // {    overlays = overlays ++ [      (import ./overlay.nix) +    (import "${nix-writers}/pkgs")    ];  }) diff --git a/pkgs/overlay.nix b/pkgs/overlay.nix index 95d4938..24ecf17 100644 --- a/pkgs/overlay.nix +++ b/pkgs/overlay.nix @@ -5,14 +5,4 @@ in  self: super: {    krops = self.callPackage ./krops {};    populate = self.callPackage ./populate {}; -  writeDash = name: text: self.writeScript name '' -    #! ${self.dash}/bin/dash -    ${text} -  ''; -  writeJSON = name: value: self.runCommand name { -    json = lib.toJSON value; -    passAsFile = [ "json" ]; -  } /* sh */ '' -    ${self.jq}/bin/jq . "$jsonPath" > "$out" -  '';  } | 
