diff options
| author | lassulus <lass@aidsballs.de> | 2015-10-02 18:30:07 +0200 |
|---|---|---|
| committer | lassulus <lass@aidsballs.de> | 2015-10-02 18:30:07 +0200 |
| commit | 400002b10a01ddfd3d95be7428de14e5b6994f93 (patch) | |
| tree | 19a68e3cf1b277b928ef7687e5a2ad62595eb744 | |
| parent | 29aa827a9596645362b8db47fb494696303fcf8f (diff) | |
| parent | 5b719cfd5e75f105a10b3fe6827f8d2aceb95693 (diff) | |
Merge remote-tracking branch 'cd/master'
| -rw-r--r-- | default.nix | 14 | ||||
| -rw-r--r-- | krebs/5pkgs/get/default.nix | 6 |
2 files changed, 17 insertions, 3 deletions
diff --git a/default.nix b/default.nix index c6a635c29..f14329d40 100644 --- a/default.nix +++ b/default.nix @@ -11,7 +11,21 @@ let user-modules-path = ./. + "/${current-user-name}/3modules"; user-pkgs-path = ./. + "/${current-user-name}/5pkgs"; + # XXX This is only used interactively, e.g. using get. + pkgs = + let + pkgs = import <nixpkgs> {}; + args = { + inherit pkgs; + lib = pkgs.lib; + }; + in + pkgs // + import krebs-pkgs-path args // + import user-pkgs-path args; + out = + { inherit pkgs; } // lib.mapAttrs (_: builtins.getAttr "main") (lib.filterAttrs (_: builtins.hasAttr "main") (lib.mapAttrs diff --git a/krebs/5pkgs/get/default.nix b/krebs/5pkgs/get/default.nix index 20bbfd014..d4f5f6b46 100644 --- a/krebs/5pkgs/get/default.nix +++ b/krebs/5pkgs/get/default.nix @@ -1,12 +1,12 @@ { coreutils, gnugrep, gnused, fetchgit, jq, nix, stdenv, ... }: stdenv.mkDerivation { - name = "get-1.3.0"; + name = "get-1.3.1"; src = fetchgit { url = http://cgit.cd.retiolum/get; - rev = "fbe8f8d12ede9762fceb15b9944b69a4ee6331eb"; - sha256 = "bcdf036f8b5d1467285d0998aeac7e48280adfb9e1278f9f424c9c8b5e6ed8fa"; + rev = "64c97edd3f9952cd5e703208c46748a035a515bf"; + sha256 = "32ca83f4fd86fd3285bef9dcfd0917308086d239189858daceca175de49ff97c"; }; phases = [ |