summaryrefslogtreecommitdiffstats
path: root/nin/2configs
diff options
context:
space:
mode:
authorlassulus <lass@lassul.us>2017-01-19 23:39:02 +0100
committerlassulus <lass@lassul.us>2017-01-19 23:39:02 +0100
commit985fcbbd50c14032d7c8ddaa2e2465e94cdad5af (patch)
tree170c921cd055c13968fada340994bd5f4fe3284c /nin/2configs
parent82149ebb75892267af3b9e0a290f975d15965894 (diff)
parentb4109e8d22284a98fcff8f409b7b1968428a1520 (diff)
Merge remote-tracking branch 'prism/newest'
Diffstat (limited to 'nin/2configs')
-rw-r--r--nin/2configs/default.nix1
-rw-r--r--nin/2configs/nixpkgs.nix2
2 files changed, 2 insertions, 1 deletions
diff --git a/nin/2configs/default.nix b/nin/2configs/default.nix
index 8ea9e49d8..e181a6041 100644
--- a/nin/2configs/default.nix
+++ b/nin/2configs/default.nix
@@ -97,6 +97,7 @@ with import <stockholm/lib>;
p7zip
unzip
unrar
+ hashPassword
];
programs.bash = {
diff --git a/nin/2configs/nixpkgs.nix b/nin/2configs/nixpkgs.nix
index eceab7e7b..9d73afbe0 100644
--- a/nin/2configs/nixpkgs.nix
+++ b/nin/2configs/nixpkgs.nix
@@ -3,6 +3,6 @@
{
krebs.build.source.nixpkgs.git = {
url = https://github.com/nixos/nixpkgs;
- ref = "fd1dbe551cf6338c5f4e4f80c2f5dde9f9e6a271";
+ ref = "6b28bd0daf00b8e5e370a04347844cb8614138ff";
};
}