diff options
| author | makefu <github@syntax-fehler.de> | 2016-10-24 14:14:58 +0200 |
|---|---|---|
| committer | makefu <github@syntax-fehler.de> | 2016-10-24 14:14:58 +0200 |
| commit | 36cbb3d300eb18330a62ba20e35f80d515f5bc5f (patch) | |
| tree | dedf23acdc5763b59b5853b07dd297b88fb15636 /krebs/5pkgs | |
| parent | 3fa63a4f312a885d353177db911f8a52ce7a1e1c (diff) | |
| parent | 08c7671fc51270e582e16cbe49aa896f8bff7685 (diff) | |
Merge remote-tracking branch 'cd/master'
Diffstat (limited to 'krebs/5pkgs')
| -rw-r--r-- | krebs/5pkgs/builders.nix | 2 | ||||
| -rw-r--r-- | krebs/5pkgs/default.nix | 2 | ||||
| -rw-r--r-- | krebs/5pkgs/populate/default.nix | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/krebs/5pkgs/builders.nix b/krebs/5pkgs/builders.nix index 841543819..5860b9a15 100644 --- a/krebs/5pkgs/builders.nix +++ b/krebs/5pkgs/builders.nix @@ -1,5 +1,5 @@ { config, pkgs, ... }: -with config.krebs.lib; +with import <stockholm/lib>; rec { execve = name: { filename, argv ? null, envp ? {}, destination ? "" }: let in writeC name { inherit destination; } /* c */ '' diff --git a/krebs/5pkgs/default.nix b/krebs/5pkgs/default.nix index 75d1dac82..876f8b9a4 100644 --- a/krebs/5pkgs/default.nix +++ b/krebs/5pkgs/default.nix @@ -1,5 +1,5 @@ { config, lib, pkgs, ... }@args: -with config.krebs.lib; +with import <stockholm/lib>; { nixpkgs.config.packageOverrides = pkgs: let diff --git a/krebs/5pkgs/populate/default.nix b/krebs/5pkgs/populate/default.nix index 09b29c6c3..dc5750bda 100644 --- a/krebs/5pkgs/populate/default.nix +++ b/krebs/5pkgs/populate/default.nix @@ -13,12 +13,12 @@ in stdenv.mkDerivation rec { name = "populate"; - version = "1.1.1"; + version = "1.2.0"; src = fetchgit { url = http://cgit.cd.krebsco.de/populate; rev = "refs/tags/v${version}"; - sha256 = "139f4lzn56lca3qgqy9g33r94m3xi1mqns9340lkb4qm6626yvqd"; + sha256 = "0q3110hkkxn9bc3a63xbx1hyd1fpzz4wrck4lng3j5a9i1y1jm07"; }; phases = [ |