Mic92/stockholm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'cd/master'

Browse Source
This commit is contained in:
lassulus 2015-10-02 18:30:07 +02:00
commit 400002b10a
2 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
default.nix
View File

@ -11,7 +11,21 @@ let
user-modules-path = ./. + "/${current-user-name}/3modules"; user-modules-path = ./. + "/${current-user-name}/3modules";
user-pkgs-path = ./. + "/${current-user-name}/5pkgs"; 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 = out =
{ inherit pkgs; } //
lib.mapAttrs (_: builtins.getAttr "main") lib.mapAttrs (_: builtins.getAttr "main")
(lib.filterAttrs (_: builtins.hasAttr "main") (lib.filterAttrs (_: builtins.hasAttr "main")
(lib.mapAttrs (lib.mapAttrs

6
krebs/5pkgs/get/default.nix
View File

@ -1,12 +1,12 @@
{ coreutils, gnugrep, gnused, fetchgit, jq, nix, stdenv, ... }: { coreutils, gnugrep, gnused, fetchgit, jq, nix, stdenv, ... }:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "get-1.3.0"; name = "get-1.3.1";
src = fetchgit { src = fetchgit {
url = http://cgit.cd.retiolum/get; url = http://cgit.cd.retiolum/get;
rev = "fbe8f8d12ede9762fceb15b9944b69a4ee6331eb"; rev = "64c97edd3f9952cd5e703208c46748a035a515bf";
sha256 = "bcdf036f8b5d1467285d0998aeac7e48280adfb9e1278f9f424c9c8b5e6ed8fa"; sha256 = "32ca83f4fd86fd3285bef9dcfd0917308086d239189858daceca175de49ff97c";
}; };
phases = [ phases = [